diff --git a/README.md b/README.md index a5a2629..0b8c7c9 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.4.0%20of%20a%20certain%20turn-based%20anime%20game%20for%20educational%20purposes.%20&font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light) +![LunarCore](https://socialify.git.ci/Melledy/LunarCore/image?description=1&descriptionEditable=A%20game%20server%20reimplementation%20for%20version%202.5.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 4a68b9f..5a90c5c 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class ActivateFarmElementCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 world_level = 13; + * optional uint32 world_level = 9; */ private int worldLevel; /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 13; */ private int entityId; @@ -39,7 +39,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 13; + * optional uint32 world_level = 9; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -47,7 +47,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 13; + * optional uint32 world_level = 9; * @return this */ public ActivateFarmElementCsReq clearWorldLevel() { @@ -57,7 +57,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 13; + * optional uint32 world_level = 9; * @return the worldLevel */ public int getWorldLevel() { @@ -65,7 +65,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 13; + * optional uint32 world_level = 9; * @param value the worldLevel to set * @return this */ @@ -76,7 +76,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 13; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -84,7 +84,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 13; * @return this */ public ActivateFarmElementCsReq clearEntityId() { @@ -94,7 +94,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 13; * @return the entityId */ public int getEntityId() { @@ -102,7 +102,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 13; * @param value the entityId to set * @return this */ @@ -177,11 +177,11 @@ public final class ActivateFarmElementCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(entityId); } } @@ -205,16 +205,16 @@ public final class ActivateFarmElementCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 72: { // worldLevel worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { + case 104: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java index e1065b0..eb3bf58 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java @@ -19,7 +19,7 @@ public final class ActivateFarmElementScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 2; */ private int entityId; @@ -29,7 +29,7 @@ public final class ActivateFarmElementScRspOuterClass { private int worldLevel; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; */ private int retcode; @@ -44,7 +44,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 2; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -52,7 +52,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 2; * @return this */ public ActivateFarmElementScRsp clearEntityId() { @@ -62,7 +62,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 2; * @return the entityId */ public int getEntityId() { @@ -70,7 +70,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 2; * @param value the entityId to set * @return this */ @@ -118,7 +118,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -126,7 +126,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return this */ public ActivateFarmElementScRsp clearRetcode() { @@ -136,7 +136,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -144,7 +144,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -225,7 +225,7 @@ public final class ActivateFarmElementScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { @@ -233,7 +233,7 @@ public final class ActivateFarmElementScRspOuterClass { output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } } @@ -260,7 +260,7 @@ public final class ActivateFarmElementScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; @@ -274,11 +274,11 @@ public final class ActivateFarmElementScRspOuterClass { worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java index 6cc2ab6..08726db 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java @@ -19,25 +19,25 @@ public final class ActivityScheduleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 end_time = 7; - */ - private long endTime; - - /** - * optional int64 begin_time = 13; + * optional int64 begin_time = 5; */ private long beginTime; /** - * optional uint32 module_id = 6; + * optional int64 end_time = 9; */ - private int moduleId; + private long endTime; /** - * optional uint32 activity_id = 9; + * optional uint32 activity_id = 11; */ private int activityId; + /** + * optional uint32 module_id = 12; + */ + private int moduleId; + private ActivityScheduleInfo() { } @@ -49,62 +49,25 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 end_time = 7; - * @return whether the endTime field is set + * optional int64 begin_time = 5; + * @return whether the beginTime field is set */ - public boolean hasEndTime() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 end_time = 7; - * @return this - */ - public ActivityScheduleInfo clearEndTime() { - bitField0_ &= ~0x00000001; - endTime = 0L; - return this; - } - - /** - * optional int64 end_time = 7; - * @return the endTime - */ - public long getEndTime() { - return endTime; - } - - /** - * optional int64 end_time = 7; - * @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 = 5; * @return this */ public ActivityScheduleInfo clearBeginTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; beginTime = 0L; return this; } /** - * optional int64 begin_time = 13; + * optional int64 begin_time = 5; * @return the beginTime */ public long getBeginTime() { @@ -112,73 +75,73 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 begin_time = 13; + * optional int64 begin_time = 5; * @param value the beginTime to set * @return this */ public ActivityScheduleInfo setBeginTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; beginTime = value; return this; } /** - * optional uint32 module_id = 6; - * @return whether the moduleId field is set + * optional int64 end_time = 9; + * @return whether the endTime field is set */ - public boolean hasModuleId() { + public boolean hasEndTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 end_time = 9; + * @return this + */ + public ActivityScheduleInfo clearEndTime() { + bitField0_ &= ~0x00000002; + 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_ |= 0x00000002; + endTime = value; + return this; + } + + /** + * optional uint32 activity_id = 11; + * @return whether the activityId field is set + */ + public boolean hasActivityId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 module_id = 6; - * @return this - */ - public ActivityScheduleInfo clearModuleId() { - bitField0_ &= ~0x00000004; - moduleId = 0; - return this; - } - - /** - * optional uint32 module_id = 6; - * @return the moduleId - */ - public int getModuleId() { - return moduleId; - } - - /** - * optional uint32 module_id = 6; - * @param value the moduleId to set - * @return this - */ - public ActivityScheduleInfo setModuleId(final int value) { - bitField0_ |= 0x00000004; - moduleId = value; - return this; - } - - /** - * optional uint32 activity_id = 9; - * @return whether the activityId field is set - */ - public boolean hasActivityId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 activity_id = 9; + * optional uint32 activity_id = 11; * @return this */ public ActivityScheduleInfo clearActivityId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; activityId = 0; return this; } /** - * optional uint32 activity_id = 9; + * optional uint32 activity_id = 11; * @return the activityId */ public int getActivityId() { @@ -186,25 +149,62 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 9; + * optional uint32 activity_id = 11; * @param value the activityId to set * @return this */ public ActivityScheduleInfo setActivityId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; activityId = value; return this; } + /** + * optional uint32 module_id = 12; + * @return whether the moduleId field is set + */ + public boolean hasModuleId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 module_id = 12; + * @return this + */ + public ActivityScheduleInfo clearModuleId() { + bitField0_ &= ~0x00000008; + moduleId = 0; + return this; + } + + /** + * optional uint32 module_id = 12; + * @return the moduleId + */ + public int getModuleId() { + return moduleId; + } + + /** + * optional uint32 module_id = 12; + * @param value the moduleId to set + * @return this + */ + public ActivityScheduleInfo setModuleId(final int value) { + bitField0_ |= 0x00000008; + moduleId = value; + return this; + } + @Override public ActivityScheduleInfo copyFrom(final ActivityScheduleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - endTime = other.endTime; beginTime = other.beginTime; - moduleId = other.moduleId; + endTime = other.endTime; activityId = other.activityId; + moduleId = other.moduleId; } return this; } @@ -215,18 +215,18 @@ public final class ActivityScheduleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEndTime()) { - setEndTime(other.endTime); - } if (other.hasBeginTime()) { setBeginTime(other.beginTime); } - if (other.hasModuleId()) { - setModuleId(other.moduleId); + if (other.hasEndTime()) { + setEndTime(other.endTime); } if (other.hasActivityId()) { setActivityId(other.activityId); } + if (other.hasModuleId()) { + setModuleId(other.moduleId); + } return this; } @@ -237,10 +237,10 @@ public final class ActivityScheduleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; - moduleId = 0; + endTime = 0L; activityId = 0; + moduleId = 0; return this; } @@ -264,29 +264,29 @@ public final class ActivityScheduleInfoOuterClass { } ActivityScheduleInfo other = (ActivityScheduleInfo) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) - && (!hasModuleId() || moduleId == other.moduleId) - && (!hasActivityId() || activityId == other.activityId); + && (!hasEndTime() || endTime == other.endTime) + && (!hasActivityId() || activityId == other.activityId) + && (!hasModuleId() || moduleId == other.moduleId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeInt64NoTag(endTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 40); output.writeInt64NoTag(beginTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeInt64NoTag(endTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(moduleId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(activityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(activityId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(moduleId); } } @@ -294,16 +294,16 @@ public final class ActivityScheduleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(moduleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(activityId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(activityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(moduleId); } return size; } @@ -315,36 +315,36 @@ public final class ActivityScheduleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // endTime - endTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 40: { // beginTime beginTime = input.readInt64(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // moduleId - moduleId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 72) { break; } } case 72: { + // endTime + endTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // activityId activityId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // moduleId + moduleId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class ActivityScheduleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.endTime, endTime); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeInt64(FieldNames.beginTime, beginTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeInt64(FieldNames.endTime, endTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.moduleId, moduleId); + output.writeUInt32(FieldNames.activityId, activityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.activityId, activityId); + output.writeUInt32(FieldNames.moduleId, moduleId); } output.endObject(); } @@ -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 { @@ -414,23 +414,23 @@ public final class ActivityScheduleInfoOuterClass { } break; } - case -604257113: - case -1552079922: { - if (input.isAtField(FieldNames.moduleId)) { - if (!input.trySkipNullValue()) { - moduleId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 2048619658: case -917278645: { if (input.isAtField(FieldNames.activityId)) { if (!input.trySkipNullValue()) { activityId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -604257113: + case -1552079922: { + if (input.isAtField(FieldNames.moduleId)) { + if (!input.trySkipNullValue()) { + moduleId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -491,13 +491,13 @@ 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 moduleId = FieldName.forField("moduleId", "module_id"); + static final FieldName endTime = FieldName.forField("endTime", "end_time"); static final FieldName activityId = FieldName.forField("activityId", "activity_id"); + + static final FieldName moduleId = FieldName.forField("moduleId", "module_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java index bbe13d1..64ac440 100644 --- a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class ApplyFriendCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 5; + * optional uint32 uid = 7; */ private int uid; /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 8; */ private int source; @@ -39,7 +39,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 7; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 7; * @return this */ public ApplyFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 7; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 7; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 8; * @return whether the source field is set */ public boolean hasSource() { @@ -84,7 +84,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 8; * @return this */ public ApplyFriendCsReq clearSource() { @@ -94,7 +94,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 8; * @return the source */ public FriendApplySourceOuterClass.FriendApplySource getSource() { @@ -127,7 +127,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 12; + * optional .FriendApplySource source = 8; * @param value the source to set * @return this */ @@ -202,11 +202,11 @@ public final class ApplyFriendCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeEnumNoTag(source); } } @@ -230,16 +230,16 @@ public final class ApplyFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 56: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 64) { break; } } - case 96: { + case 64: { // 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 06fa354..4e00bf4 100644 --- a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java @@ -26,20 +26,20 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 2; + * repeated uint32 archive_equipment_id_list = 12; */ private final RepeatedInt archiveEquipmentIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .MonsterArchive archive_monster_id_list = 11; - */ - private final RepeatedMessage archiveMonsterIdList = RepeatedMessage.newEmptyInstance(MonsterArchiveOuterClass.MonsterArchive.getFactory()); - - /** - * repeated .RelicArchive relic_list = 12; + * repeated .RelicArchive relic_list = 2; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicArchiveOuterClass.RelicArchive.getFactory()); + /** + * repeated .MonsterArchive archive_monster_id_list = 5; + */ + private final RepeatedMessage archiveMonsterIdList = RepeatedMessage.newEmptyInstance(MonsterArchiveOuterClass.MonsterArchive.getFactory()); + private ArchiveData() { } @@ -56,7 +56,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 2; + * repeated uint32 archive_equipment_id_list = 12; * @return whether the archiveEquipmentIdList field is set */ public boolean hasArchiveEquipmentIdList() { @@ -69,7 +69,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 2; + * repeated uint32 archive_equipment_id_list = 12; * @return this */ public ArchiveData clearArchiveEquipmentIdList() { @@ -84,7 +84,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 2; + * repeated uint32 archive_equipment_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. @@ -103,7 +103,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 2; + * repeated uint32 archive_equipment_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 @@ -122,7 +122,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 2; + * repeated uint32 archive_equipment_id_list = 12; * @param value the archiveEquipmentIdList to add * @return this */ @@ -138,7 +138,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 2; + * repeated uint32 archive_equipment_id_list = 12; * @param values the archiveEquipmentIdList to add * @return this */ @@ -149,96 +149,25 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 11; - * @return whether the archiveMonsterIdList field is set + * repeated .RelicArchive relic_list = 2; + * @return whether the relicList field is set */ - public boolean hasArchiveMonsterIdList() { + public boolean hasRelicList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .MonsterArchive archive_monster_id_list = 11; - * @return this - */ - public ArchiveData clearArchiveMonsterIdList() { - bitField0_ &= ~0x00000002; - archiveMonsterIdList.clear(); - return this; - } - - /** - * repeated .MonsterArchive archive_monster_id_list = 11; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableArchiveMonsterIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getArchiveMonsterIdList() { - return archiveMonsterIdList; - } - - /** - * repeated .MonsterArchive archive_monster_id_list = 11; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableArchiveMonsterIdList( - ) { - bitField0_ |= 0x00000002; - return archiveMonsterIdList; - } - - /** - * repeated .MonsterArchive archive_monster_id_list = 11; - * @param value the archiveMonsterIdList to add - * @return this - */ - public ArchiveData addArchiveMonsterIdList( - final MonsterArchiveOuterClass.MonsterArchive value) { - bitField0_ |= 0x00000002; - archiveMonsterIdList.add(value); - return this; - } - - /** - * repeated .MonsterArchive archive_monster_id_list = 11; - * @param values the archiveMonsterIdList to add - * @return this - */ - public ArchiveData addAllArchiveMonsterIdList( - final MonsterArchiveOuterClass.MonsterArchive... values) { - bitField0_ |= 0x00000002; - archiveMonsterIdList.addAll(values); - return this; - } - - /** - * repeated .RelicArchive relic_list = 12; - * @return whether the relicList field is set - */ - public boolean hasRelicList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .RelicArchive relic_list = 12; + * repeated .RelicArchive relic_list = 2; * @return this */ public ArchiveData clearRelicList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; relicList.clear(); return this; } /** - * repeated .RelicArchive relic_list = 12; + * repeated .RelicArchive 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. @@ -252,7 +181,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .RelicArchive relic_list = 12; + * repeated .RelicArchive 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 @@ -261,40 +190,111 @@ public final class ArchiveDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return relicList; } /** - * repeated .RelicArchive relic_list = 12; + * repeated .RelicArchive relic_list = 2; * @param value the relicList to add * @return this */ public ArchiveData addRelicList(final RelicArchiveOuterClass.RelicArchive value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; relicList.add(value); return this; } /** - * repeated .RelicArchive relic_list = 12; + * repeated .RelicArchive relic_list = 2; * @param values the relicList to add * @return this */ public ArchiveData addAllRelicList(final RelicArchiveOuterClass.RelicArchive... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; relicList.addAll(values); return this; } + /** + * repeated .MonsterArchive archive_monster_id_list = 5; + * @return whether the archiveMonsterIdList field is set + */ + public boolean hasArchiveMonsterIdList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .MonsterArchive archive_monster_id_list = 5; + * @return this + */ + public ArchiveData clearArchiveMonsterIdList() { + bitField0_ &= ~0x00000004; + archiveMonsterIdList.clear(); + return this; + } + + /** + * repeated .MonsterArchive archive_monster_id_list = 5; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableArchiveMonsterIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getArchiveMonsterIdList() { + return archiveMonsterIdList; + } + + /** + * repeated .MonsterArchive archive_monster_id_list = 5; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableArchiveMonsterIdList( + ) { + bitField0_ |= 0x00000004; + return archiveMonsterIdList; + } + + /** + * repeated .MonsterArchive archive_monster_id_list = 5; + * @param value the archiveMonsterIdList to add + * @return this + */ + public ArchiveData addArchiveMonsterIdList( + final MonsterArchiveOuterClass.MonsterArchive value) { + bitField0_ |= 0x00000004; + archiveMonsterIdList.add(value); + return this; + } + + /** + * repeated .MonsterArchive archive_monster_id_list = 5; + * @param values the archiveMonsterIdList to add + * @return this + */ + public ArchiveData addAllArchiveMonsterIdList( + final MonsterArchiveOuterClass.MonsterArchive... values) { + bitField0_ |= 0x00000004; + archiveMonsterIdList.addAll(values); + return this; + } + @Override public ArchiveData copyFrom(final ArchiveData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; archiveEquipmentIdList.copyFrom(other.archiveEquipmentIdList); - archiveMonsterIdList.copyFrom(other.archiveMonsterIdList); relicList.copyFrom(other.relicList); + archiveMonsterIdList.copyFrom(other.archiveMonsterIdList); } return this; } @@ -308,12 +308,12 @@ public final class ArchiveDataOuterClass { if (other.hasArchiveEquipmentIdList()) { getMutableArchiveEquipmentIdList().addAll(other.archiveEquipmentIdList); } - if (other.hasArchiveMonsterIdList()) { - getMutableArchiveMonsterIdList().addAll(other.archiveMonsterIdList); - } if (other.hasRelicList()) { getMutableRelicList().addAll(other.relicList); } + if (other.hasArchiveMonsterIdList()) { + getMutableArchiveMonsterIdList().addAll(other.archiveMonsterIdList); + } return this; } @@ -325,8 +325,8 @@ public final class ArchiveDataOuterClass { cachedSize = -1; bitField0_ = 0; archiveEquipmentIdList.clear(); - archiveMonsterIdList.clear(); relicList.clear(); + archiveMonsterIdList.clear(); return this; } @@ -338,8 +338,8 @@ public final class ArchiveDataOuterClass { cachedSize = -1; bitField0_ = 0; archiveEquipmentIdList.clear(); - archiveMonsterIdList.clearQuick(); relicList.clearQuick(); + archiveMonsterIdList.clearQuick(); return this; } @@ -354,28 +354,28 @@ public final class ArchiveDataOuterClass { ArchiveData other = (ArchiveData) o; return bitField0_ == other.bitField0_ && (!hasArchiveEquipmentIdList() || archiveEquipmentIdList.equals(other.archiveEquipmentIdList)) - && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList)) - && (!hasRelicList() || relicList.equals(other.relicList)); + && (!hasRelicList() || relicList.equals(other.relicList)) + && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < archiveEquipmentIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(archiveEquipmentIdList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < archiveMonsterIdList.length(); i++) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(archiveMonsterIdList.get(i)); + for (int i = 0; i < relicList.length(); i++) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(relicList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < archiveMonsterIdList.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(archiveMonsterIdList.get(i)); } } } @@ -387,10 +387,10 @@ public final class ArchiveDataOuterClass { size += (1 * archiveEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveEquipmentIdList); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * archiveMonsterIdList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveMonsterIdList); + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * archiveMonsterIdList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveMonsterIdList); } return size; } @@ -402,26 +402,26 @@ public final class ArchiveDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 98: { // archiveEquipmentIdList [packed=true] input.readPackedUInt32(archiveEquipmentIdList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 18) { break; } } - case 90: { - // archiveMonsterIdList - tag = input.readRepeatedMessage(archiveMonsterIdList, tag); - bitField0_ |= 0x00000002; - if (tag != 98) { - break; - } - } - case 98: { + case 18: { // relicList tag = input.readRepeatedMessage(relicList, tag); + bitField0_ |= 0x00000002; + if (tag != 42) { + break; + } + } + case 42: { + // archiveMonsterIdList + tag = input.readRepeatedMessage(archiveMonsterIdList, tag); bitField0_ |= 0x00000004; if (tag != 0) { break; @@ -437,7 +437,7 @@ public final class ArchiveDataOuterClass { tag = input.readTag(); break; } - case 16: { + case 96: { // archiveEquipmentIdList [packed=false] tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag); bitField0_ |= 0x00000001; @@ -454,10 +454,10 @@ public final class ArchiveDataOuterClass { output.writeRepeatedUInt32(FieldNames.archiveEquipmentIdList, archiveEquipmentIdList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.archiveMonsterIdList, archiveMonsterIdList); + output.writeRepeatedMessage(FieldNames.relicList, relicList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedMessage(FieldNames.archiveMonsterIdList, archiveMonsterIdList); } output.endObject(); } @@ -481,11 +481,11 @@ public final class ArchiveDataOuterClass { } break; } - case 912174897: - case 1817787488: { - if (input.isAtField(FieldNames.archiveMonsterIdList)) { + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(archiveMonsterIdList); + input.readRepeatedMessage(relicList); bitField0_ |= 0x00000002; } } else { @@ -493,11 +493,11 @@ public final class ArchiveDataOuterClass { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { + case 912174897: + case 1817787488: { + if (input.isAtField(FieldNames.archiveMonsterIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); + input.readRepeatedMessage(archiveMonsterIdList); bitField0_ |= 0x00000004; } } else { @@ -559,9 +559,9 @@ public final class ArchiveDataOuterClass { static class FieldNames { static final FieldName archiveEquipmentIdList = FieldName.forField("archiveEquipmentIdList", "archive_equipment_id_list"); - static final FieldName archiveMonsterIdList = FieldName.forField("archiveMonsterIdList", "archive_monster_id_list"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); + + static final FieldName archiveMonsterIdList = FieldName.forField("archiveMonsterIdList", "archive_monster_id_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java index af73e2c..832153c 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 = 9; + * repeated uint32 entity_id_list = 4; */ private final RepeatedInt entityIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 9; + * repeated uint32 entity_id_list = 4; * @return whether the entityIdList field is set */ public boolean hasEntityIdList() { @@ -43,7 +43,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 9; + * repeated uint32 entity_id_list = 4; * @return this */ public AssistMonsterWave clearEntityIdList() { @@ -53,7 +53,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 9; + * repeated uint32 entity_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 AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 9; + * repeated uint32 entity_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 AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 9; + * repeated uint32 entity_id_list = 4; * @param value the entityIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 9; + * repeated uint32 entity_id_list = 4; * @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) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(entityIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class AssistMonsterWaveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 34: { // entityIdList [packed=true] input.readPackedUInt32(entityIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class AssistMonsterWaveOuterClass { tag = input.readTag(); break; } - case 72: { + case 32: { // 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 a6f5c77..53b79b0 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 level = 1; - */ - private int level; - - /** - * optional uint32 dressed_skin_id = 5; - */ - private int dressedSkinId; - - /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 2; */ private int avatarId; /** - * optional uint32 pos = 12; + * optional uint32 pos = 6; */ private int pos; + /** + * optional uint32 level = 12; + */ + private int level; + + /** + * optional uint32 dressed_skin_id = 15; + */ + private int dressedSkinId; + private AssistSimpleInfo() { } @@ -49,99 +49,25 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 level = 1; - * @return whether the level field is set + * optional uint32 avatar_id = 2; + * @return whether the avatarId field is set */ - public boolean hasLevel() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 level = 1; - * @return this - */ - public AssistSimpleInfo clearLevel() { - bitField0_ &= ~0x00000001; - level = 0; - return this; - } - - /** - * optional uint32 level = 1; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 1; - * @param value the level to set - * @return this - */ - public AssistSimpleInfo setLevel(final int value) { - bitField0_ |= 0x00000001; - level = value; - return this; - } - - /** - * optional uint32 dressed_skin_id = 5; - * @return whether the dressedSkinId field is set - */ - public boolean hasDressedSkinId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 dressed_skin_id = 5; - * @return this - */ - public AssistSimpleInfo clearDressedSkinId() { - bitField0_ &= ~0x00000002; - dressedSkinId = 0; - return this; - } - - /** - * optional uint32 dressed_skin_id = 5; - * @return the dressedSkinId - */ - public int getDressedSkinId() { - return dressedSkinId; - } - - /** - * optional uint32 dressed_skin_id = 5; - * @param value the dressedSkinId to set - * @return this - */ - public AssistSimpleInfo setDressedSkinId(final int value) { - bitField0_ |= 0x00000002; - dressedSkinId = value; - return this; - } - - /** - * optional uint32 avatar_id = 9; - * @return whether the avatarId field is set - */ - public boolean hasAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 2; * @return this */ public AssistSimpleInfo clearAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 2; * @return the avatarId */ public int getAvatarId() { @@ -149,36 +75,36 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 2; * @param value the avatarId to set * @return this */ public AssistSimpleInfo setAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; avatarId = value; return this; } /** - * optional uint32 pos = 12; + * optional uint32 pos = 6; * @return whether the pos field is set */ public boolean hasPos() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 pos = 12; + * optional uint32 pos = 6; * @return this */ public AssistSimpleInfo clearPos() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; pos = 0; return this; } /** - * optional uint32 pos = 12; + * optional uint32 pos = 6; * @return the pos */ public int getPos() { @@ -186,25 +112,99 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 pos = 12; + * optional uint32 pos = 6; * @param value the pos to set * @return this */ public AssistSimpleInfo setPos(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; pos = value; return this; } + /** + * optional uint32 level = 12; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 12; + * @return this + */ + public AssistSimpleInfo clearLevel() { + bitField0_ &= ~0x00000004; + level = 0; + return this; + } + + /** + * optional uint32 level = 12; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 12; + * @param value the level to set + * @return this + */ + public AssistSimpleInfo setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + + /** + * optional uint32 dressed_skin_id = 15; + * @return whether the dressedSkinId field is set + */ + public boolean hasDressedSkinId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 dressed_skin_id = 15; + * @return this + */ + public AssistSimpleInfo clearDressedSkinId() { + bitField0_ &= ~0x00000008; + 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 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_; - level = other.level; - dressedSkinId = other.dressedSkinId; avatarId = other.avatarId; pos = other.pos; + level = other.level; + dressedSkinId = other.dressedSkinId; } return this; } @@ -215,18 +215,18 @@ public final class AssistSimpleInfoOuterClass { return this; } cachedSize = -1; - 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.hasLevel()) { + setLevel(other.level); + } + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); + } return this; } @@ -237,10 +237,10 @@ public final class AssistSimpleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - level = 0; - dressedSkinId = 0; avatarId = 0; pos = 0; + level = 0; + dressedSkinId = 0; return this; } @@ -264,47 +264,47 @@ public final class AssistSimpleInfoOuterClass { } AssistSimpleInfo other = (AssistSimpleInfo) o; return bitField0_ == other.bitField0_ - && (!hasLevel() || level == other.level) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasPos() || pos == other.pos); + && (!hasPos() || pos == other.pos) + && (!hasLevel() || level == other.level) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(dressedSkinId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(avatarId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); output.writeUInt32NoTag(pos); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(dressedSkinId); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + } return size; } @@ -315,36 +315,36 @@ public final class AssistSimpleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // dressedSkinId - dressedSkinId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 16: { // avatarId avatarId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // pos + pos = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // pos - pos = input.readUInt32(); + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // dressedSkinId + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,17 +369,17 @@ public final class AssistSimpleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.avatarId, avatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.pos, pos); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + } output.endObject(); } @@ -390,11 +390,34 @@ public final class AssistSimpleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { + if (!input.trySkipNullValue()) { + avatarId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 111188: { + if (input.isAtField(FieldNames.pos)) { + if (!input.trySkipNullValue()) { + pos = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -406,29 +429,6 @@ public final class AssistSimpleInfoOuterClass { if (input.isAtField(FieldNames.dressedSkinId)) { if (!input.trySkipNullValue()) { dressedSkinId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { - if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); - bitField0_ |= 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 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 level = FieldName.forField("level"); + + 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 1654356..20712dc 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 = 12; + * optional uint32 base_avatar_id = 1; */ private int baseAvatarId; /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_list = 4; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 1; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 1; * @return this */ public AvatarExpUpCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 1; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 1; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_list = 4; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_list = 4; * @return this */ public AvatarExpUpCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_list = 4; * @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) 96); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 34); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class AvatarExpUpCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 8: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 34) { break; } } - case 114: { + case 34: { // 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 ec24d62..4a86c20 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 = 9; + * optional uint32 retcode = 12; */ private int retcode; /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 11; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return this */ public AvatarExpUpScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 11; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 11; * @return this */ public AvatarExpUpScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * 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 AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * 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 AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 11; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 11; * @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) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 90); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class AvatarExpUpScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 90) { break; } } - case 98: { + case 90: { // 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 da72dda..27c36dc 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java @@ -21,47 +21,47 @@ public final class AvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 first_met_timestamp = 8; + * optional uint64 first_met_timestamp = 4; */ private long firstMetTimestamp; /** - * optional uint32 rank = 1; - */ - private int rank; - - /** - * optional uint32 level = 5; + * optional uint32 level = 1; */ private int level; /** - * optional uint32 dressed_skin_id = 6; - */ - private int dressedSkinId; - - /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 3; */ private int equipmentUniqueId; /** - * optional uint32 promotion = 12; + * optional uint32 dressed_skin_id = 8; + */ + private int dressedSkinId; + + /** + * optional uint32 promotion = 9; */ private int promotion; /** - * optional uint32 base_avatar_id = 13; - */ - private int baseAvatarId; - - /** - * optional uint32 exp = 15; + * optional uint32 exp = 10; */ private int exp; /** - * optional bool is_marked = 3; + * optional uint32 rank = 13; + */ + private int rank; + + /** + * optional uint32 base_avatar_id = 15; + */ + private int baseAvatarId; + + /** + * optional bool is_marked = 6; */ private boolean isMarked; @@ -71,15 +71,15 @@ public final class AvatarOuterClass { private final RepeatedInt takenRewards = RepeatedInt.newEmptyInstance(); /** - * repeated .AvatarSkillTree skilltree_list = 9; - */ - private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); - - /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 2; */ private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); + /** + * repeated .AvatarSkillTree skilltree_list = 14; + */ + private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + private Avatar() { } @@ -91,7 +91,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 8; + * optional uint64 first_met_timestamp = 4; * @return whether the firstMetTimestamp field is set */ public boolean hasFirstMetTimestamp() { @@ -99,7 +99,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 8; + * optional uint64 first_met_timestamp = 4; * @return this */ public Avatar clearFirstMetTimestamp() { @@ -109,7 +109,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 8; + * optional uint64 first_met_timestamp = 4; * @return the firstMetTimestamp */ public long getFirstMetTimestamp() { @@ -117,7 +117,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 8; + * optional uint64 first_met_timestamp = 4; * @param value the firstMetTimestamp to set * @return this */ @@ -128,62 +128,25 @@ public final class AvatarOuterClass { } /** - * optional uint32 rank = 1; - * @return whether the rank field is set + * optional uint32 level = 1; + * @return whether the level field is set */ - public boolean hasRank() { + public boolean hasLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 rank = 1; - * @return this - */ - public Avatar clearRank() { - bitField0_ &= ~0x00000002; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 1; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 1; - * @param value the rank to set - * @return this - */ - public Avatar setRank(final int value) { - bitField0_ |= 0x00000002; - rank = value; - return this; - } - - /** - * optional uint32 level = 5; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 level = 5; + * optional uint32 level = 1; * @return this */ public Avatar clearLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; level = 0; return this; } /** - * optional uint32 level = 5; + * optional uint32 level = 1; * @return the level */ public int getLevel() { @@ -191,18 +154,55 @@ public final class AvatarOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 1; * @param value the level to set * @return this */ public Avatar setLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; level = value; return this; } /** - * optional uint32 dressed_skin_id = 6; + * optional uint32 equipment_unique_id = 3; + * @return whether the equipmentUniqueId field is set + */ + public boolean hasEquipmentUniqueId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 equipment_unique_id = 3; + * @return this + */ + public Avatar clearEquipmentUniqueId() { + bitField0_ &= ~0x00000004; + 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 Avatar setEquipmentUniqueId(final int value) { + bitField0_ |= 0x00000004; + equipmentUniqueId = value; + return this; + } + + /** + * optional uint32 dressed_skin_id = 8; * @return whether the dressedSkinId field is set */ public boolean hasDressedSkinId() { @@ -210,7 +210,7 @@ public final class AvatarOuterClass { } /** - * optional uint32 dressed_skin_id = 6; + * optional uint32 dressed_skin_id = 8; * @return this */ public Avatar clearDressedSkinId() { @@ -220,7 +220,7 @@ public final class AvatarOuterClass { } /** - * optional uint32 dressed_skin_id = 6; + * optional uint32 dressed_skin_id = 8; * @return the dressedSkinId */ public int getDressedSkinId() { @@ -228,7 +228,7 @@ public final class AvatarOuterClass { } /** - * optional uint32 dressed_skin_id = 6; + * optional uint32 dressed_skin_id = 8; * @param value the dressedSkinId to set * @return this */ @@ -239,62 +239,25 @@ public final class AvatarOuterClass { } /** - * optional uint32 equipment_unique_id = 7; - * @return whether the equipmentUniqueId field is set + * optional uint32 promotion = 9; + * @return whether the promotion field is set */ - public boolean hasEquipmentUniqueId() { + public boolean hasPromotion() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 equipment_unique_id = 7; - * @return this - */ - public Avatar clearEquipmentUniqueId() { - bitField0_ &= ~0x00000010; - equipmentUniqueId = 0; - return this; - } - - /** - * optional uint32 equipment_unique_id = 7; - * @return the equipmentUniqueId - */ - public int getEquipmentUniqueId() { - return equipmentUniqueId; - } - - /** - * optional uint32 equipment_unique_id = 7; - * @param value the equipmentUniqueId to set - * @return this - */ - public Avatar setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000010; - equipmentUniqueId = value; - return this; - } - - /** - * optional uint32 promotion = 12; - * @return whether the promotion field is set - */ - public boolean hasPromotion() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 promotion = 12; + * optional uint32 promotion = 9; * @return this */ public Avatar clearPromotion() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; promotion = 0; return this; } /** - * optional uint32 promotion = 12; + * optional uint32 promotion = 9; * @return the promotion */ public int getPromotion() { @@ -302,73 +265,36 @@ public final class AvatarOuterClass { } /** - * optional uint32 promotion = 12; + * optional uint32 promotion = 9; * @param value the promotion to set * @return this */ public Avatar setPromotion(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; promotion = value; return this; } /** - * optional uint32 base_avatar_id = 13; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 base_avatar_id = 13; - * @return this - */ - public Avatar clearBaseAvatarId() { - bitField0_ &= ~0x00000040; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 13; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 13; - * @param value the baseAvatarId to set - * @return this - */ - public Avatar setBaseAvatarId(final int value) { - bitField0_ |= 0x00000040; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 exp = 15; + * optional uint32 exp = 10; * @return whether the exp field is set */ public boolean hasExp() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 exp = 15; + * optional uint32 exp = 10; * @return this */ public Avatar clearExp() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000020; exp = 0; return this; } /** - * optional uint32 exp = 15; + * optional uint32 exp = 10; * @return the exp */ public int getExp() { @@ -376,18 +302,92 @@ public final class AvatarOuterClass { } /** - * optional uint32 exp = 15; + * optional uint32 exp = 10; * @param value the exp to set * @return this */ public Avatar setExp(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; exp = value; return this; } /** - * optional bool is_marked = 3; + * optional uint32 rank = 13; + * @return whether the rank field is set + */ + public boolean hasRank() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 rank = 13; + * @return this + */ + public Avatar clearRank() { + bitField0_ &= ~0x00000040; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 13; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 13; + * @param value the rank to set + * @return this + */ + public Avatar setRank(final int value) { + bitField0_ |= 0x00000040; + rank = value; + return this; + } + + /** + * optional uint32 base_avatar_id = 15; + * @return whether the baseAvatarId field is set + */ + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional uint32 base_avatar_id = 15; + * @return this + */ + public Avatar clearBaseAvatarId() { + bitField0_ &= ~0x00000080; + baseAvatarId = 0; + return this; + } + + /** + * optional uint32 base_avatar_id = 15; + * @return the baseAvatarId + */ + public int getBaseAvatarId() { + return baseAvatarId; + } + + /** + * optional uint32 base_avatar_id = 15; + * @param value the baseAvatarId to set + * @return this + */ + public Avatar setBaseAvatarId(final int value) { + bitField0_ |= 0x00000080; + baseAvatarId = value; + return this; + } + + /** + * optional bool is_marked = 6; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -395,7 +395,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 3; + * optional bool is_marked = 6; * @return this */ public Avatar clearIsMarked() { @@ -405,7 +405,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 3; + * optional bool is_marked = 6; * @return the isMarked */ public boolean getIsMarked() { @@ -413,7 +413,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 3; + * optional bool is_marked = 6; * @param value the isMarked to set * @return this */ @@ -492,93 +492,25 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 9; - * @return whether the skilltreeList field is set + * repeated .EquipRelic equip_relic_list = 2; + * @return whether the equipRelicList field is set */ - public boolean hasSkilltreeList() { + public boolean hasEquipRelicList() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .AvatarSkillTree skilltree_list = 9; - * @return this - */ - public Avatar clearSkilltreeList() { - bitField0_ &= ~0x00000400; - skilltreeList.clear(); - return this; - } - - /** - * repeated .AvatarSkillTree skilltree_list = 9; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableSkilltreeList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getSkilltreeList() { - return skilltreeList; - } - - /** - * repeated .AvatarSkillTree skilltree_list = 9; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * 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 = 9; - * @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 = 9; - * @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 = 14; - * @return whether the equipRelicList field is set - */ - public boolean hasEquipRelicList() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 2; * @return this */ public Avatar clearEquipRelicList() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00000400; equipRelicList.clear(); return this; } /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_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. @@ -592,7 +524,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_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 @@ -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 = 14; + * repeated .EquipRelic equip_relic_list = 2; * @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 = 14; + * repeated .EquipRelic equip_relic_list = 2; * @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 = 14; + * @return whether the skilltreeList field is set + */ + public boolean hasSkilltreeList() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * repeated .AvatarSkillTree skilltree_list = 14; + * @return this + */ + public Avatar clearSkilltreeList() { + bitField0_ &= ~0x00000800; + 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_ |= 0x00000800; + return skilltreeList; + } + + /** + * repeated .AvatarSkillTree skilltree_list = 14; + * @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 = 14; + * @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; - rank = other.rank; level = other.level; - dressedSkinId = other.dressedSkinId; equipmentUniqueId = other.equipmentUniqueId; + dressedSkinId = other.dressedSkinId; promotion = other.promotion; - baseAvatarId = other.baseAvatarId; exp = other.exp; + rank = other.rank; + baseAvatarId = other.baseAvatarId; 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.hasRank()) { - setRank(other.rank); - } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); - } if (other.hasEquipmentUniqueId()) { setEquipmentUniqueId(other.equipmentUniqueId); } + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); + } if (other.hasPromotion()) { setPromotion(other.promotion); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasExp()) { setExp(other.exp); } + if (other.hasRank()) { + setRank(other.rank); + } + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); + } 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; - rank = 0; level = 0; - dressedSkinId = 0; equipmentUniqueId = 0; + dressedSkinId = 0; promotion = 0; - baseAvatarId = 0; exp = 0; + rank = 0; + baseAvatarId = 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,55 +739,55 @@ public final class AvatarOuterClass { Avatar other = (Avatar) o; return bitField0_ == other.bitField0_ && (!hasFirstMetTimestamp() || firstMetTimestamp == other.firstMetTimestamp) - && (!hasRank() || rank == other.rank) && (!hasLevel() || level == other.level) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasPromotion() || promotion == other.promotion) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasExp() || exp == other.exp) + && (!hasRank() || rank == other.rank) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!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) 64); + output.writeRawByte((byte) 32); output.writeUInt64NoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(rank); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); output.writeUInt32NoTag(level); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(equipmentUniqueId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(dressedSkinId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(equipmentUniqueId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(baseAvatarId); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(exp); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isMarked); } if ((bitField0_ & 0x00000200) != 0) { @@ -797,15 +797,15 @@ public final class AvatarOuterClass { } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(skilltreeList.get(i)); + for (int i = 0; i < equipRelicList.length(); i++) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(equipRelicList.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { - for (int i = 0; i < equipRelicList.length(); i++) { + for (int i = 0; i < skilltreeList.length(); i++) { output.writeRawByte((byte) 114); - output.writeMessageNoTag(equipRelicList.get(i)); + 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(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } 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 64: { + case 32: { // firstMetTimestamp firstMetTimestamp = input.readUInt64(); bitField0_ |= 0x00000001; @@ -869,44 +869,44 @@ public final class AvatarOuterClass { } } case 8: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { // level level = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 24) { break; } } - case 48: { + case 24: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { // dressedSkinId dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 56) { + if (tag != 72) { break; } } - case 56: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 72: { // promotion promotion = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 104) { @@ -914,8 +914,8 @@ public final class AvatarOuterClass { } } case 104: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 120) { @@ -923,15 +923,15 @@ public final class AvatarOuterClass { } } case 120: { - // exp - exp = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 24) { + if (tag != 48) { break; } } - case 24: { + case 48: { // isMarked isMarked = input.readBool(); bitField0_ |= 0x00000100; @@ -945,21 +945,21 @@ public final class AvatarOuterClass { input.readPackedUInt32(takenRewards, tag); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 74) { + if (tag != 18) { break; } } - case 74: { - // skilltreeList - tag = input.readRepeatedMessage(skilltreeList, tag); + case 18: { + // equipRelicList + tag = input.readRepeatedMessage(equipRelicList, tag); bitField0_ |= 0x00000400; if (tag != 114) { break; } } case 114: { - // equipRelicList - tag = input.readRepeatedMessage(equipRelicList, tag); + // skilltreeList + tag = input.readRepeatedMessage(skilltreeList, tag); bitField0_ |= 0x00000800; if (tag != 0) { break; @@ -992,25 +992,25 @@ public final class AvatarOuterClass { output.writeUInt64(FieldNames.firstMetTimestamp, firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.promotion, promotion); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } 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,10 +1046,10 @@ public final class AvatarOuterClass { } 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 { @@ -1057,10 +1057,11 @@ public final class AvatarOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1080,11 +1081,10 @@ public final class AvatarOuterClass { } break; } - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1092,10 +1092,10 @@ public final class AvatarOuterClass { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1103,22 +1103,22 @@ public final class AvatarOuterClass { } break; } + case 3492908: { + if (input.isAtField(FieldNames.rank)) { + if (!input.trySkipNullValue()) { + rank = input.readUInt32(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } case 118022725: case -1756826157: { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case 100893: { - if (input.isAtField(FieldNames.exp)) { - if (!input.trySkipNullValue()) { - exp = input.readUInt32(); bitField0_ |= 0x00000080; } } else { @@ -1150,11 +1150,11 @@ public final class AvatarOuterClass { } break; } - case 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 rank = FieldName.forField("rank"); - static final FieldName level = FieldName.forField("level"); - static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); + 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 exp = FieldName.forField("exp"); + static final FieldName rank = FieldName.forField("rank"); + + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_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/AvatarPathChangedNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarPathChangedNotifyOuterClass.java index 6506bab..ce81d3b 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarPathChangedNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarPathChangedNotifyOuterClass.java @@ -24,7 +24,7 @@ public final class AvatarPathChangedNotifyOuterClass { private int baseAvatarId; /** - * optional .MultiPathAvatarType changed_avatar_type = 9; + * optional .MultiPathAvatarType changed_avatar_type = 8; */ private int changedAvatarType; @@ -76,7 +76,7 @@ public final class AvatarPathChangedNotifyOuterClass { } /** - * optional .MultiPathAvatarType changed_avatar_type = 9; + * optional .MultiPathAvatarType changed_avatar_type = 8; * @return whether the changedAvatarType field is set */ public boolean hasChangedAvatarType() { @@ -84,7 +84,7 @@ public final class AvatarPathChangedNotifyOuterClass { } /** - * optional .MultiPathAvatarType changed_avatar_type = 9; + * optional .MultiPathAvatarType changed_avatar_type = 8; * @return this */ public AvatarPathChangedNotify clearChangedAvatarType() { @@ -94,7 +94,7 @@ public final class AvatarPathChangedNotifyOuterClass { } /** - * optional .MultiPathAvatarType changed_avatar_type = 9; + * optional .MultiPathAvatarType changed_avatar_type = 8; * @return the changedAvatarType */ public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getChangedAvatarType() { @@ -127,7 +127,7 @@ public final class AvatarPathChangedNotifyOuterClass { } /** - * optional .MultiPathAvatarType changed_avatar_type = 9; + * optional .MultiPathAvatarType changed_avatar_type = 8; * @param value the changedAvatarType to set * @return this */ @@ -207,7 +207,7 @@ public final class AvatarPathChangedNotifyOuterClass { output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeEnumNoTag(changedAvatarType); } } @@ -236,11 +236,11 @@ public final class AvatarPathChangedNotifyOuterClass { baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { + case 64: { // changedAvatarType final int value = input.readInt32(); if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java index 5795f3c..a24bb46 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 = 12; + * repeated .Avatar avatar_list = 10; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -35,7 +35,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 12; + * repeated .Avatar avatar_list = 10; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -43,7 +43,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 12; + * repeated .Avatar avatar_list = 10; * @return this */ public AvatarSync clearAvatarList() { @@ -53,7 +53,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 12; + * repeated .Avatar 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 AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 12; + * repeated .Avatar 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 AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 12; + * repeated .Avatar avatar_list = 10; * @param value the avatarList to add * @return this */ @@ -92,7 +92,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 12; + * repeated .Avatar avatar_list = 10; * @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) 98); + output.writeRawByte((byte) 82); output.writeMessageNoTag(avatarList.get(i)); } } @@ -185,7 +185,7 @@ public final class AvatarSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 82: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/AvatarTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarTypeOuterClass.java index 5171b4c..a2778bb 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarTypeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarTypeOuterClass.java @@ -87,7 +87,7 @@ public final class AvatarTypeOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return AvatarTypeConverter.INSTANCE; } @@ -109,7 +109,7 @@ public final class AvatarTypeOuterClass { return value == null ? other : value; } - enum AvatarTypeConverter implements EnumConverter { + enum AvatarTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final AvatarType[] lookup = new AvatarType[5]; diff --git a/src/generated/main/emu/lunarcore/proto/BattleEndReasonOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleEndReasonOuterClass.java index 53d5d31..e5e673a 100644 --- a/src/generated/main/emu/lunarcore/proto/BattleEndReasonOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattleEndReasonOuterClass.java @@ -67,7 +67,7 @@ public final class BattleEndReasonOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return BattleEndReasonConverter.INSTANCE; } @@ -89,7 +89,7 @@ public final class BattleEndReasonOuterClass { return value == null ? other : value; } - enum BattleEndReasonConverter implements EnumConverter { + enum BattleEndReasonConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final BattleEndReason[] lookup = new BattleEndReason[3]; diff --git a/src/generated/main/emu/lunarcore/proto/BattleEndStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleEndStatusOuterClass.java index 25a3206..acdde11 100644 --- a/src/generated/main/emu/lunarcore/proto/BattleEndStatusOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattleEndStatusOuterClass.java @@ -77,7 +77,7 @@ public final class BattleEndStatusOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return BattleEndStatusConverter.INSTANCE; } @@ -99,7 +99,7 @@ public final class BattleEndStatusOuterClass { return value == null ? other : value; } - enum BattleEndStatusConverter implements EnumConverter { + enum BattleEndStatusConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final BattleEndStatus[] lookup = new BattleEndStatus[4]; diff --git a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java index a0f87f9..23a669b 100644 --- a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java @@ -21,33 +21,33 @@ public final class BattlePassInfoNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 taken_premium_reward2 = 2; + * optional uint64 taken_premium_reward1 = 3; */ - private long takenPremiumReward2; + private long takenPremiumReward1; + + /** + * optional uint64 taken_premium_extended_reward = 6; + */ + private long takenPremiumExtendedReward; + + /** + * optional uint64 taken_free_extended_reward = 7; + */ + private long takenFreeExtendedReward; /** * 
      *  the difficult ones
      *
* - * optional uint64 taken_free_reward = 7; + * optional uint64 taken_free_reward = 8; */ private long takenFreeReward; /** - * optional uint64 taken_premium_reward1 = 8; + * optional uint64 taken_premium_reward2 = 12; */ - private long takenPremiumReward1; - - /** - * optional uint64 taken_premium_extended_reward = 10; - */ - private long takenPremiumExtendedReward; - - /** - * optional uint64 taken_free_extended_reward = 11; - */ - private long takenFreeExtendedReward; + private long takenPremiumReward2; /** * optional uint64 taken_premium_optional_reward = 15; @@ -55,27 +55,27 @@ public final class BattlePassInfoNotifyOuterClass { private long takenPremiumOptionalReward; /** - * optional uint32 cur_bp_id = 1; - */ - private int curBpId; - - /** - * optional uint32 level = 4; + * optional uint32 level = 1; */ private int level; /** - * optional uint32 exp = 12; + * optional uint32 exp = 4; */ private int exp; + /** + * optional uint32 cur_bp_id = 9; + */ + private int curBpId; + /** * optional uint32 cur_week_add_exp_sum = 14; */ private int curWeekAddExpSum; /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 13; */ private int bpTierType; @@ -90,64 +90,138 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward2 = 2; - * @return whether the takenPremiumReward2 field is set + * optional uint64 taken_premium_reward1 = 3; + * @return whether the takenPremiumReward1 field is set */ - public boolean hasTakenPremiumReward2() { + public boolean hasTakenPremiumReward1() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 taken_premium_reward2 = 2; + * optional uint64 taken_premium_reward1 = 3; * @return this */ - public BattlePassInfoNotify clearTakenPremiumReward2() { + public BattlePassInfoNotify clearTakenPremiumReward1() { bitField0_ &= ~0x00000001; - takenPremiumReward2 = 0L; + takenPremiumReward1 = 0L; return this; } /** - * optional uint64 taken_premium_reward2 = 2; - * @return the takenPremiumReward2 + * optional uint64 taken_premium_reward1 = 3; + * @return the takenPremiumReward1 */ - public long getTakenPremiumReward2() { - return takenPremiumReward2; + public long getTakenPremiumReward1() { + return takenPremiumReward1; } /** - * optional uint64 taken_premium_reward2 = 2; - * @param value the takenPremiumReward2 to set + * optional uint64 taken_premium_reward1 = 3; + * @param value the takenPremiumReward1 to set * @return this */ - public BattlePassInfoNotify setTakenPremiumReward2(final long value) { + public BattlePassInfoNotify setTakenPremiumReward1(final long value) { bitField0_ |= 0x00000001; - takenPremiumReward2 = value; + takenPremiumReward1 = value; return this; } /** - * 
-     *  the difficult ones
-     *
- * - * optional uint64 taken_free_reward = 7; - * @return whether the takenFreeReward field is set + * optional uint64 taken_premium_extended_reward = 6; + * @return whether the takenPremiumExtendedReward field is set */ - public boolean hasTakenFreeReward() { + public boolean hasTakenPremiumExtendedReward() { return (bitField0_ & 0x00000002) != 0; } + /** + * optional uint64 taken_premium_extended_reward = 6; + * @return this + */ + public BattlePassInfoNotify clearTakenPremiumExtendedReward() { + bitField0_ &= ~0x00000002; + takenPremiumExtendedReward = 0L; + return this; + } + + /** + * optional uint64 taken_premium_extended_reward = 6; + * @return the takenPremiumExtendedReward + */ + public long getTakenPremiumExtendedReward() { + return takenPremiumExtendedReward; + } + + /** + * optional uint64 taken_premium_extended_reward = 6; + * @param value the takenPremiumExtendedReward to set + * @return this + */ + public BattlePassInfoNotify setTakenPremiumExtendedReward(final long value) { + bitField0_ |= 0x00000002; + takenPremiumExtendedReward = value; + return this; + } + + /** + * optional uint64 taken_free_extended_reward = 7; + * @return whether the takenFreeExtendedReward field is set + */ + public boolean hasTakenFreeExtendedReward() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint64 taken_free_extended_reward = 7; + * @return this + */ + public BattlePassInfoNotify clearTakenFreeExtendedReward() { + bitField0_ &= ~0x00000004; + takenFreeExtendedReward = 0L; + return this; + } + + /** + * optional uint64 taken_free_extended_reward = 7; + * @return the takenFreeExtendedReward + */ + public long getTakenFreeExtendedReward() { + return takenFreeExtendedReward; + } + + /** + * optional uint64 taken_free_extended_reward = 7; + * @param value the takenFreeExtendedReward to set + * @return this + */ + public BattlePassInfoNotify setTakenFreeExtendedReward(final long value) { + bitField0_ |= 0x00000004; + takenFreeExtendedReward = value; + return this; + } + /** * 
      *  the difficult ones
      *
* - * optional uint64 taken_free_reward = 7; + * optional uint64 taken_free_reward = 8; + * @return whether the takenFreeReward field is set + */ + public boolean hasTakenFreeReward() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * 
+     *  the difficult ones
+     *
+ * + * optional uint64 taken_free_reward = 8; * @return this */ public BattlePassInfoNotify clearTakenFreeReward() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000008; takenFreeReward = 0L; return this; } @@ -157,7 +231,7 @@ public final class BattlePassInfoNotifyOuterClass { * the difficult ones * * - * optional uint64 taken_free_reward = 7; + * optional uint64 taken_free_reward = 8; * @return the takenFreeReward */ public long getTakenFreeReward() { @@ -169,124 +243,50 @@ public final class BattlePassInfoNotifyOuterClass { * the difficult ones * * - * optional uint64 taken_free_reward = 7; + * optional uint64 taken_free_reward = 8; * @param value the takenFreeReward to set * @return this */ public BattlePassInfoNotify setTakenFreeReward(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; takenFreeReward = value; return this; } /** - * optional uint64 taken_premium_reward1 = 8; - * @return whether the takenPremiumReward1 field is set + * optional uint64 taken_premium_reward2 = 12; + * @return whether the takenPremiumReward2 field is set */ - public boolean hasTakenPremiumReward1() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint64 taken_premium_reward1 = 8; - * @return this - */ - public BattlePassInfoNotify clearTakenPremiumReward1() { - bitField0_ &= ~0x00000004; - takenPremiumReward1 = 0L; - return this; - } - - /** - * optional uint64 taken_premium_reward1 = 8; - * @return the takenPremiumReward1 - */ - public long getTakenPremiumReward1() { - return takenPremiumReward1; - } - - /** - * optional uint64 taken_premium_reward1 = 8; - * @param value the takenPremiumReward1 to set - * @return this - */ - public BattlePassInfoNotify setTakenPremiumReward1(final long value) { - bitField0_ |= 0x00000004; - takenPremiumReward1 = value; - return this; - } - - /** - * optional uint64 taken_premium_extended_reward = 10; - * @return whether the takenPremiumExtendedReward field is set - */ - public boolean hasTakenPremiumExtendedReward() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint64 taken_premium_extended_reward = 10; - * @return this - */ - public BattlePassInfoNotify clearTakenPremiumExtendedReward() { - bitField0_ &= ~0x00000008; - takenPremiumExtendedReward = 0L; - return this; - } - - /** - * optional uint64 taken_premium_extended_reward = 10; - * @return the takenPremiumExtendedReward - */ - public long getTakenPremiumExtendedReward() { - return takenPremiumExtendedReward; - } - - /** - * optional uint64 taken_premium_extended_reward = 10; - * @param value the takenPremiumExtendedReward to set - * @return this - */ - public BattlePassInfoNotify setTakenPremiumExtendedReward(final long value) { - bitField0_ |= 0x00000008; - takenPremiumExtendedReward = value; - return this; - } - - /** - * optional uint64 taken_free_extended_reward = 11; - * @return whether the takenFreeExtendedReward field is set - */ - public boolean hasTakenFreeExtendedReward() { + public boolean hasTakenPremiumReward2() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint64 taken_free_extended_reward = 11; + * optional uint64 taken_premium_reward2 = 12; * @return this */ - public BattlePassInfoNotify clearTakenFreeExtendedReward() { + public BattlePassInfoNotify clearTakenPremiumReward2() { bitField0_ &= ~0x00000010; - takenFreeExtendedReward = 0L; + takenPremiumReward2 = 0L; return this; } /** - * optional uint64 taken_free_extended_reward = 11; - * @return the takenFreeExtendedReward + * optional uint64 taken_premium_reward2 = 12; + * @return the takenPremiumReward2 */ - public long getTakenFreeExtendedReward() { - return takenFreeExtendedReward; + public long getTakenPremiumReward2() { + return takenPremiumReward2; } /** - * optional uint64 taken_free_extended_reward = 11; - * @param value the takenFreeExtendedReward to set + * optional uint64 taken_premium_reward2 = 12; + * @param value the takenPremiumReward2 to set * @return this */ - public BattlePassInfoNotify setTakenFreeExtendedReward(final long value) { + public BattlePassInfoNotify setTakenPremiumReward2(final long value) { bitField0_ |= 0x00000010; - takenFreeExtendedReward = value; + takenPremiumReward2 = value; return this; } @@ -328,62 +328,25 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint32 cur_bp_id = 1; - * @return whether the curBpId field is set + * optional uint32 level = 1; + * @return whether the level field is set */ - public boolean hasCurBpId() { + public boolean hasLevel() { 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 level = 4; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional uint32 level = 4; + * optional uint32 level = 1; * @return this */ public BattlePassInfoNotify clearLevel() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; level = 0; return this; } /** - * optional uint32 level = 4; + * optional uint32 level = 1; * @return the level */ public int getLevel() { @@ -391,36 +354,36 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 1; * @param value the level to set * @return this */ public BattlePassInfoNotify setLevel(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; level = value; return this; } /** - * optional uint32 exp = 12; + * optional uint32 exp = 4; * @return whether the exp field is set */ public boolean hasExp() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * optional uint32 exp = 12; + * optional uint32 exp = 4; * @return this */ public BattlePassInfoNotify clearExp() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; exp = 0; return this; } /** - * optional uint32 exp = 12; + * optional uint32 exp = 4; * @return the exp */ public int getExp() { @@ -428,16 +391,53 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint32 exp = 12; + * optional uint32 exp = 4; * @param value the exp to set * @return this */ public BattlePassInfoNotify setExp(final int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; exp = value; return this; } + /** + * optional uint32 cur_bp_id = 9; + * @return whether the curBpId field is set + */ + public boolean hasCurBpId() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional uint32 cur_bp_id = 9; + * @return this + */ + public BattlePassInfoNotify clearCurBpId() { + bitField0_ &= ~0x00000100; + curBpId = 0; + return this; + } + + /** + * optional uint32 cur_bp_id = 9; + * @return the curBpId + */ + public int getCurBpId() { + return curBpId; + } + + /** + * optional uint32 cur_bp_id = 9; + * @param value the curBpId to set + * @return this + */ + public BattlePassInfoNotify setCurBpId(final int value) { + bitField0_ |= 0x00000100; + curBpId = value; + return this; + } + /** * optional uint32 cur_week_add_exp_sum = 14; * @return whether the curWeekAddExpSum field is set @@ -476,7 +476,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 13; * @return whether the bpTierType field is set */ public boolean hasBpTierType() { @@ -484,7 +484,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 13; * @return this */ public BattlePassInfoNotify clearBpTierType() { @@ -494,7 +494,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 13; * @return the bpTierType */ public BpTierType getBpTierType() { @@ -527,7 +527,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 13; * @param value the bpTierType to set * @return this */ @@ -542,15 +542,15 @@ public final class BattlePassInfoNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - takenPremiumReward2 = other.takenPremiumReward2; - takenFreeReward = other.takenFreeReward; takenPremiumReward1 = other.takenPremiumReward1; takenPremiumExtendedReward = other.takenPremiumExtendedReward; takenFreeExtendedReward = other.takenFreeExtendedReward; + takenFreeReward = other.takenFreeReward; + takenPremiumReward2 = other.takenPremiumReward2; takenPremiumOptionalReward = other.takenPremiumOptionalReward; - curBpId = other.curBpId; level = other.level; exp = other.exp; + curBpId = other.curBpId; curWeekAddExpSum = other.curWeekAddExpSum; bpTierType = other.bpTierType; } @@ -563,12 +563,6 @@ public final class BattlePassInfoNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasTakenPremiumReward2()) { - setTakenPremiumReward2(other.takenPremiumReward2); - } - if (other.hasTakenFreeReward()) { - setTakenFreeReward(other.takenFreeReward); - } if (other.hasTakenPremiumReward1()) { setTakenPremiumReward1(other.takenPremiumReward1); } @@ -578,18 +572,24 @@ public final class BattlePassInfoNotifyOuterClass { if (other.hasTakenFreeExtendedReward()) { setTakenFreeExtendedReward(other.takenFreeExtendedReward); } + if (other.hasTakenFreeReward()) { + setTakenFreeReward(other.takenFreeReward); + } + if (other.hasTakenPremiumReward2()) { + setTakenPremiumReward2(other.takenPremiumReward2); + } if (other.hasTakenPremiumOptionalReward()) { setTakenPremiumOptionalReward(other.takenPremiumOptionalReward); } - if (other.hasCurBpId()) { - setCurBpId(other.curBpId); - } if (other.hasLevel()) { setLevel(other.level); } if (other.hasExp()) { setExp(other.exp); } + if (other.hasCurBpId()) { + setCurBpId(other.curBpId); + } if (other.hasCurWeekAddExpSum()) { setCurWeekAddExpSum(other.curWeekAddExpSum); } @@ -606,15 +606,15 @@ public final class BattlePassInfoNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - takenPremiumReward2 = 0L; - takenFreeReward = 0L; takenPremiumReward1 = 0L; takenPremiumExtendedReward = 0L; takenFreeExtendedReward = 0L; + takenFreeReward = 0L; + takenPremiumReward2 = 0L; takenPremiumOptionalReward = 0L; - curBpId = 0; level = 0; exp = 0; + curBpId = 0; curWeekAddExpSum = 0; bpTierType = 0; return this; @@ -640,15 +640,15 @@ public final class BattlePassInfoNotifyOuterClass { } BattlePassInfoNotify other = (BattlePassInfoNotify) o; return bitField0_ == other.bitField0_ - && (!hasTakenPremiumReward2() || takenPremiumReward2 == other.takenPremiumReward2) - && (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward) && (!hasTakenPremiumReward1() || takenPremiumReward1 == other.takenPremiumReward1) && (!hasTakenPremiumExtendedReward() || takenPremiumExtendedReward == other.takenPremiumExtendedReward) && (!hasTakenFreeExtendedReward() || takenFreeExtendedReward == other.takenFreeExtendedReward) + && (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward) + && (!hasTakenPremiumReward2() || takenPremiumReward2 == other.takenPremiumReward2) && (!hasTakenPremiumOptionalReward() || takenPremiumOptionalReward == other.takenPremiumOptionalReward) - && (!hasCurBpId() || curBpId == other.curBpId) && (!hasLevel() || level == other.level) && (!hasExp() || exp == other.exp) + && (!hasCurBpId() || curBpId == other.curBpId) && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum) && (!hasBpTierType() || bpTierType == other.bpTierType); } @@ -656,47 +656,47 @@ public final class BattlePassInfoNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt64NoTag(takenPremiumReward2); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt64NoTag(takenFreeReward); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 24); output.writeUInt64NoTag(takenPremiumReward1); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); output.writeUInt64NoTag(takenPremiumExtendedReward); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); output.writeUInt64NoTag(takenFreeExtendedReward); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt64NoTag(takenFreeReward); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt64NoTag(takenPremiumReward2); + } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 120); output.writeUInt64NoTag(takenPremiumOptionalReward); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(curBpId); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(level); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(curBpId); } if ((bitField0_ & 0x00000200) != 0) { output.writeRawByte((byte) 112); output.writeUInt32NoTag(curWeekAddExpSum); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 104); output.writeEnumNoTag(bpTierType); } } @@ -705,32 +705,32 @@ public final class BattlePassInfoNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward2); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeReward); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward1); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumExtendedReward); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeExtendedReward); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeReward); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward2); + } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumOptionalReward); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId); - } - if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } + if ((bitField0_ & 0x00000100) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId); + } if ((bitField0_ & 0x00000200) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curWeekAddExpSum); } @@ -747,45 +747,45 @@ public final class BattlePassInfoNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // takenPremiumReward2 - takenPremiumReward2 = input.readUInt64(); + case 24: { + // takenPremiumReward1 + takenPremiumReward1 = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // takenPremiumExtendedReward + takenPremiumExtendedReward = input.readUInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // takenFreeReward - takenFreeReward = input.readUInt64(); - bitField0_ |= 0x00000002; + // takenFreeExtendedReward + takenFreeExtendedReward = input.readUInt64(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 64) { break; } } case 64: { - // takenPremiumReward1 - takenPremiumReward1 = input.readUInt64(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // takenPremiumExtendedReward - takenPremiumExtendedReward = input.readUInt64(); + // takenFreeReward + takenFreeReward = input.readUInt64(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // takenFreeExtendedReward - takenFreeExtendedReward = input.readUInt64(); + case 96: { + // takenPremiumReward2 + takenPremiumReward2 = input.readUInt64(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 120) { @@ -802,8 +802,8 @@ public final class BattlePassInfoNotifyOuterClass { } } case 8: { - // curBpId - curBpId = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 32) { @@ -811,17 +811,17 @@ public final class BattlePassInfoNotifyOuterClass { } } case 32: { - // level - level = input.readUInt32(); + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { - // exp - exp = input.readUInt32(); + case 72: { + // curBpId + curBpId = input.readUInt32(); bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 112) { @@ -833,11 +833,11 @@ public final class BattlePassInfoNotifyOuterClass { curWeekAddExpSum = input.readUInt32(); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 40) { + if (tag != 104) { break; } } - case 40: { + case 104: { // bpTierType final int value = input.readInt32(); if (BpTierType.forNumber(value) != null) { @@ -867,32 +867,32 @@ public final class BattlePassInfoNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.takenPremiumReward2, takenPremiumReward2); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt64(FieldNames.takenFreeReward, takenFreeReward); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt64(FieldNames.takenPremiumReward1, takenPremiumReward1); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt64(FieldNames.takenPremiumExtendedReward, takenPremiumExtendedReward); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt64(FieldNames.takenFreeExtendedReward, takenFreeExtendedReward); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt64(FieldNames.takenFreeReward, takenFreeReward); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt64(FieldNames.takenPremiumReward2, takenPremiumReward2); + } if ((bitField0_ & 0x00000020) != 0) { output.writeUInt64(FieldNames.takenPremiumOptionalReward, takenPremiumOptionalReward); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.curBpId, curBpId); - } - if ((bitField0_ & 0x00000080) != 0) { output.writeUInt32(FieldNames.level, level); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeUInt32(FieldNames.exp, exp); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeUInt32(FieldNames.curBpId, curBpId); + } if ((bitField0_ & 0x00000200) != 0) { output.writeUInt32(FieldNames.curWeekAddExpSum, curWeekAddExpSum); } @@ -909,36 +909,12 @@ public final class BattlePassInfoNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 226926899: - case 1195903363: { - if (input.isAtField(FieldNames.takenPremiumReward2)) { - if (!input.trySkipNullValue()) { - takenPremiumReward2 = input.readUInt64(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1065549026: - case 135671018: { - if (input.isAtField(FieldNames.takenFreeReward)) { - if (!input.trySkipNullValue()) { - takenFreeReward = input.readUInt64(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 226926898: case 1195903362: { if (input.isAtField(FieldNames.takenPremiumReward1)) { if (!input.trySkipNullValue()) { takenPremiumReward1 = input.readUInt64(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -950,7 +926,7 @@ public final class BattlePassInfoNotifyOuterClass { if (input.isAtField(FieldNames.takenPremiumExtendedReward)) { if (!input.trySkipNullValue()) { takenPremiumExtendedReward = input.readUInt64(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -962,6 +938,30 @@ public final class BattlePassInfoNotifyOuterClass { if (input.isAtField(FieldNames.takenFreeExtendedReward)) { if (!input.trySkipNullValue()) { takenFreeExtendedReward = input.readUInt64(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1065549026: + case 135671018: { + if (input.isAtField(FieldNames.takenFreeReward)) { + if (!input.trySkipNullValue()) { + takenFreeReward = input.readUInt64(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 226926899: + case 1195903363: { + if (input.isAtField(FieldNames.takenPremiumReward2)) { + if (!input.trySkipNullValue()) { + takenPremiumReward2 = input.readUInt64(); bitField0_ |= 0x00000010; } } else { @@ -981,23 +981,11 @@ 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 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1008,6 +996,18 @@ public final class BattlePassInfoNotifyOuterClass { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1125519465: + case 110923757: { + if (input.isAtField(FieldNames.curBpId)) { + if (!input.trySkipNullValue()) { + curBpId = input.readUInt32(); bitField0_ |= 0x00000100; } } else { @@ -1161,7 +1161,7 @@ public final class BattlePassInfoNotifyOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return BpTierTypeConverter.INSTANCE; } @@ -1183,7 +1183,7 @@ public final class BattlePassInfoNotifyOuterClass { return value == null ? other : value; } - enum BpTierTypeConverter implements EnumConverter { + enum BpTierTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final BpTierType[] lookup = new BpTierType[4]; @@ -1239,24 +1239,24 @@ public final class BattlePassInfoNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName takenPremiumReward2 = FieldName.forField("takenPremiumReward2", "taken_premium_reward2"); - - static final FieldName takenFreeReward = FieldName.forField("takenFreeReward", "taken_free_reward"); - static final FieldName takenPremiumReward1 = FieldName.forField("takenPremiumReward1", "taken_premium_reward1"); static final FieldName takenPremiumExtendedReward = FieldName.forField("takenPremiumExtendedReward", "taken_premium_extended_reward"); static final FieldName takenFreeExtendedReward = FieldName.forField("takenFreeExtendedReward", "taken_free_extended_reward"); - static final FieldName takenPremiumOptionalReward = FieldName.forField("takenPremiumOptionalReward", "taken_premium_optional_reward"); + static final FieldName takenFreeReward = FieldName.forField("takenFreeReward", "taken_free_reward"); - static final FieldName curBpId = FieldName.forField("curBpId", "cur_bp_id"); + static final FieldName takenPremiumReward2 = FieldName.forField("takenPremiumReward2", "taken_premium_reward2"); + + static final FieldName takenPremiumOptionalReward = FieldName.forField("takenPremiumOptionalReward", "taken_premium_optional_reward"); static final FieldName level = FieldName.forField("level"); static final FieldName exp = FieldName.forField("exp"); + static final FieldName curBpId = FieldName.forField("curBpId", "cur_bp_id"); + 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 b6efcff..9213247 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 = 6; + * optional string signature = 13; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 15; + * repeated .HeadIcon unlocked_head_icon_list = 14; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -41,7 +41,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 13; * @return whether the signature field is set */ public boolean hasSignature() { @@ -49,7 +49,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 13; * @return this */ public BoardDataSync clearSignature() { @@ -59,7 +59,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 13; * @return the signature */ public String getSignature() { @@ -67,7 +67,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 13; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -75,7 +75,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 13; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -84,7 +84,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 13; * @param value the signature to set * @return this */ @@ -95,7 +95,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 13; * @param value the signature to set * @return this */ @@ -106,7 +106,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 15; + * repeated .HeadIcon unlocked_head_icon_list = 14; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -114,7 +114,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 15; + * repeated .HeadIcon unlocked_head_icon_list = 14; * @return this */ public BoardDataSync clearUnlockedHeadIconList() { @@ -124,7 +124,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 15; + * repeated .HeadIcon unlocked_head_icon_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. @@ -138,7 +138,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 15; + * repeated .HeadIcon unlocked_head_icon_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 @@ -152,7 +152,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 15; + * repeated .HeadIcon unlocked_head_icon_list = 14; * @param value the unlockedHeadIconList to add * @return this */ @@ -163,7 +163,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 15; + * repeated .HeadIcon unlocked_head_icon_list = 14; * @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) 50); + output.writeRawByte((byte) 106); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 114); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -270,16 +270,16 @@ public final class BoardDataSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 106: { // signature input.readString(signature); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { + case 114: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java index fe3c3e2..1c6dcb2 100644 --- a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java @@ -22,37 +22,37 @@ public final class BuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 add_time_ms = 15; + * optional uint64 add_time_ms = 11; */ private long addTimeMs; /** - * optional float life_time = 11; + * optional float life_time = 15; */ private float lifeTime; /** - * optional uint32 buff_id = 3; - */ - private int buffId; - - /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; */ private int baseAvatarId; /** - * optional uint32 level = 7; - */ - private int level; - - /** - * optional uint32 count = 8; + * optional uint32 count = 5; */ private int count; /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * optional uint32 level = 9; + */ + private int level; + + /** + * optional uint32 buff_id = 13; + */ + private int buffId; + + /** + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1; */ private final RepeatedMessage dynamicValues = RepeatedMessage.newEmptyInstance(DynamicValuesEntry.getFactory()); @@ -67,7 +67,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 15; + * optional uint64 add_time_ms = 11; * @return whether the addTimeMs field is set */ public boolean hasAddTimeMs() { @@ -75,7 +75,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 15; + * optional uint64 add_time_ms = 11; * @return this */ public BuffInfo clearAddTimeMs() { @@ -85,7 +85,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 15; + * optional uint64 add_time_ms = 11; * @return the addTimeMs */ public long getAddTimeMs() { @@ -93,7 +93,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 15; + * optional uint64 add_time_ms = 11; * @param value the addTimeMs to set * @return this */ @@ -104,7 +104,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 11; + * optional float life_time = 15; * @return whether the lifeTime field is set */ public boolean hasLifeTime() { @@ -112,7 +112,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 11; + * optional float life_time = 15; * @return this */ public BuffInfo clearLifeTime() { @@ -122,7 +122,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 11; + * optional float life_time = 15; * @return the lifeTime */ public float getLifeTime() { @@ -130,7 +130,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 11; + * optional float life_time = 15; * @param value the lifeTime to set * @return this */ @@ -141,62 +141,25 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 buff_id = 3; - * @return whether the buffId field is set + * optional uint32 base_avatar_id = 3; + * @return whether the baseAvatarId field is set */ - public boolean hasBuffId() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 buff_id = 3; - * @return this - */ - public BuffInfo clearBuffId() { - bitField0_ &= ~0x00000004; - 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 BuffInfo setBuffId(final int value) { - bitField0_ |= 0x00000004; - buffId = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 5; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; * @return this */ public BuffInfo clearBaseAvatarId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -204,18 +167,55 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 3; * @param value the baseAvatarId to set * @return this */ public BuffInfo setBaseAvatarId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; baseAvatarId = value; return this; } /** - * optional uint32 level = 7; + * optional uint32 count = 5; + * @return whether the count field is set + */ + public boolean hasCount() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 count = 5; + * @return this + */ + public BuffInfo clearCount() { + bitField0_ &= ~0x00000008; + count = 0; + return this; + } + + /** + * optional uint32 count = 5; + * @return the count + */ + public int getCount() { + return count; + } + + /** + * optional uint32 count = 5; + * @param value the count to set + * @return this + */ + public BuffInfo setCount(final int value) { + bitField0_ |= 0x00000008; + count = value; + return this; + } + + /** + * optional uint32 level = 9; * @return whether the level field is set */ public boolean hasLevel() { @@ -223,7 +223,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 7; + * optional uint32 level = 9; * @return this */ public BuffInfo clearLevel() { @@ -233,7 +233,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 7; + * optional uint32 level = 9; * @return the level */ public int getLevel() { @@ -241,7 +241,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 7; + * optional uint32 level = 9; * @param value the level to set * @return this */ @@ -252,44 +252,44 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 count = 8; - * @return whether the count field is set + * optional uint32 buff_id = 13; + * @return whether the buffId field is set */ - public boolean hasCount() { + public boolean hasBuffId() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 count = 8; + * optional uint32 buff_id = 13; * @return this */ - public BuffInfo clearCount() { + public BuffInfo clearBuffId() { bitField0_ &= ~0x00000020; - count = 0; + buffId = 0; return this; } /** - * optional uint32 count = 8; - * @return the count + * optional uint32 buff_id = 13; + * @return the buffId */ - public int getCount() { - return count; + public int getBuffId() { + return buffId; } /** - * optional uint32 count = 8; - * @param value the count to set + * optional uint32 buff_id = 13; + * @param value the buffId to set * @return this */ - public BuffInfo setCount(final int value) { + public BuffInfo setBuffId(final int value) { bitField0_ |= 0x00000020; - count = value; + buffId = value; return this; } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1; * @return whether the dynamicValues field is set */ public boolean hasDynamicValues() { @@ -297,7 +297,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1; * @return this */ public BuffInfo clearDynamicValues() { @@ -307,7 +307,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 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. @@ -321,7 +321,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 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 @@ -335,7 +335,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1; * @param value the dynamicValues to add * @return this */ @@ -346,7 +346,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1; * @param values the dynamicValues to add * @return this */ @@ -363,10 +363,10 @@ public final class BuffInfoOuterClass { bitField0_ = other.bitField0_; addTimeMs = other.addTimeMs; lifeTime = other.lifeTime; - buffId = other.buffId; baseAvatarId = other.baseAvatarId; - level = other.level; count = other.count; + level = other.level; + buffId = other.buffId; dynamicValues.copyFrom(other.dynamicValues); } return this; @@ -384,17 +384,17 @@ public final class BuffInfoOuterClass { if (other.hasLifeTime()) { setLifeTime(other.lifeTime); } - if (other.hasBuffId()) { - setBuffId(other.buffId); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasCount()) { + setCount(other.count); + } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasCount()) { - setCount(other.count); + if (other.hasBuffId()) { + setBuffId(other.buffId); } if (other.hasDynamicValues()) { getMutableDynamicValues().addAll(other.dynamicValues); @@ -411,10 +411,10 @@ public final class BuffInfoOuterClass { bitField0_ = 0; addTimeMs = 0L; lifeTime = 0F; - buffId = 0; baseAvatarId = 0; - level = 0; count = 0; + level = 0; + buffId = 0; dynamicValues.clear(); return this; } @@ -442,42 +442,42 @@ public final class BuffInfoOuterClass { return bitField0_ == other.bitField0_ && (!hasAddTimeMs() || addTimeMs == other.addTimeMs) && (!hasLifeTime() || ProtoUtil.isEqual(lifeTime, other.lifeTime)) - && (!hasBuffId() || buffId == other.buffId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasLevel() || level == other.level) && (!hasCount() || count == other.count) + && (!hasLevel() || level == other.level) + && (!hasBuffId() || buffId == other.buffId) && (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt64NoTag(addTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 93); + output.writeRawByte((byte) 125); output.writeFloatNoTag(lifeTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(buffId); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(baseAvatarId); + output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(count); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < dynamicValues.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(dynamicValues.get(i)); } } @@ -493,16 +493,16 @@ public final class BuffInfoOuterClass { size += 5; } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } if ((bitField0_ & 0x00000040) != 0) { size += (1 * dynamicValues.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dynamicValues); @@ -517,16 +517,16 @@ public final class BuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 88: { // addTimeMs addTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 93) { + if (tag != 125) { break; } } - case 93: { + case 125: { // lifeTime lifeTime = input.readFloat(); bitField0_ |= 0x00000002; @@ -536,8 +536,8 @@ public final class BuffInfoOuterClass { } } case 24: { - // buffId - buffId = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 40) { @@ -545,33 +545,33 @@ public final class BuffInfoOuterClass { } } case 40: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // count + count = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 56) { + if (tag != 72) { break; } } - case 56: { + case 72: { // level level = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { - // count - count = input.readUInt32(); + case 104: { + // buffId + buffId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // dynamicValues tag = input.readRepeatedMessage(dynamicValues, tag); bitField0_ |= 0x00000040; @@ -603,16 +603,16 @@ public final class BuffInfoOuterClass { output.writeFloat(FieldNames.lifeTime, lifeTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.buffId, buffId); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.dynamicValues, dynamicValues); @@ -651,11 +651,11 @@ public final class BuffInfoOuterClass { } break; } - case -1378119474: - case 227990663: { - if (input.isAtField(FieldNames.buffId)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - buffId = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -663,11 +663,10 @@ public final class BuffInfoOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -686,10 +685,11 @@ public final class BuffInfoOuterClass { } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1378119474: + case 227990663: { + if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + buffId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1119,13 +1119,13 @@ public final class BuffInfoOuterClass { static final FieldName lifeTime = FieldName.forField("lifeTime", "life_time"); - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName count = FieldName.forField("count"); + static final FieldName level = FieldName.forField("level"); - static final FieldName count = FieldName.forField("count"); + static final FieldName buffId = FieldName.forField("buffId", "buff_id"); static final FieldName dynamicValues = FieldName.forField("dynamicValues", "dynamic_values"); } diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java index fb3d1e6..96486d0 100644 --- a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java @@ -19,27 +19,27 @@ public final class BuyGoodsScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 shop_id = 2; - */ - private int shopId; - - /** - * optional uint32 goods_buy_times = 8; - */ - private int goodsBuyTimes; - - /** - * optional uint32 goods_id = 11; - */ - private int goodsId; - - /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .ItemList return_item_list = 7; + * optional uint32 goods_buy_times = 10; + */ + private int goodsBuyTimes; + + /** + * optional uint32 goods_id = 13; + */ + private int goodsId; + + /** + * optional uint32 shop_id = 15; + */ + private int shopId; + + /** + * optional .ItemList return_item_list = 6; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -54,44 +54,44 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 shop_id = 2; - * @return whether the shopId field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasShopId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 shop_id = 2; + * optional uint32 retcode = 1; * @return this */ - public BuyGoodsScRsp clearShopId() { + public BuyGoodsScRsp clearRetcode() { bitField0_ &= ~0x00000001; - shopId = 0; + retcode = 0; return this; } /** - * optional uint32 shop_id = 2; - * @return the shopId + * optional uint32 retcode = 1; + * @return the retcode */ - public int getShopId() { - return shopId; + public int getRetcode() { + return retcode; } /** - * optional uint32 shop_id = 2; - * @param value the shopId to set + * optional uint32 retcode = 1; + * @param value the retcode to set * @return this */ - public BuyGoodsScRsp setShopId(final int value) { + public BuyGoodsScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - shopId = value; + retcode = value; return this; } /** - * optional uint32 goods_buy_times = 8; + * optional uint32 goods_buy_times = 10; * @return whether the goodsBuyTimes field is set */ public boolean hasGoodsBuyTimes() { @@ -99,7 +99,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_buy_times = 8; + * optional uint32 goods_buy_times = 10; * @return this */ public BuyGoodsScRsp clearGoodsBuyTimes() { @@ -109,7 +109,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_buy_times = 8; + * optional uint32 goods_buy_times = 10; * @return the goodsBuyTimes */ public int getGoodsBuyTimes() { @@ -117,7 +117,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_buy_times = 8; + * optional uint32 goods_buy_times = 10; * @param value the goodsBuyTimes to set * @return this */ @@ -128,7 +128,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_id = 11; + * optional uint32 goods_id = 13; * @return whether the goodsId field is set */ public boolean hasGoodsId() { @@ -136,7 +136,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_id = 11; + * optional uint32 goods_id = 13; * @return this */ public BuyGoodsScRsp clearGoodsId() { @@ -146,7 +146,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_id = 11; + * optional uint32 goods_id = 13; * @return the goodsId */ public int getGoodsId() { @@ -154,7 +154,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_id = 11; + * optional uint32 goods_id = 13; * @param value the goodsId to set * @return this */ @@ -165,44 +165,44 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set + * optional uint32 shop_id = 15; + * @return whether the shopId field is set */ - public boolean hasRetcode() { + public boolean hasShopId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 retcode = 14; + * optional uint32 shop_id = 15; * @return this */ - public BuyGoodsScRsp clearRetcode() { + public BuyGoodsScRsp clearShopId() { bitField0_ &= ~0x00000008; - retcode = 0; + shopId = 0; return this; } /** - * optional uint32 retcode = 14; - * @return the retcode + * optional uint32 shop_id = 15; + * @return the shopId */ - public int getRetcode() { - return retcode; + public int getShopId() { + return shopId; } /** - * optional uint32 retcode = 14; - * @param value the retcode to set + * optional uint32 shop_id = 15; + * @param value the shopId to set * @return this */ - public BuyGoodsScRsp setRetcode(final int value) { + public BuyGoodsScRsp setShopId(final int value) { bitField0_ |= 0x00000008; - retcode = value; + shopId = value; return this; } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 6; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -210,7 +210,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 6; * @return this */ public BuyGoodsScRsp clearReturnItemList() { @@ -220,7 +220,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -234,7 +234,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -248,7 +248,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 6; * @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_; - shopId = other.shopId; + retcode = other.retcode; goodsBuyTimes = other.goodsBuyTimes; goodsId = other.goodsId; - retcode = other.retcode; + shopId = other.shopId; returnItemList.copyFrom(other.returnItemList); } return this; @@ -278,8 +278,8 @@ public final class BuyGoodsScRspOuterClass { return this; } cachedSize = -1; - if (other.hasShopId()) { - setShopId(other.shopId); + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasGoodsBuyTimes()) { setGoodsBuyTimes(other.goodsBuyTimes); @@ -287,8 +287,8 @@ public final class BuyGoodsScRspOuterClass { if (other.hasGoodsId()) { setGoodsId(other.goodsId); } - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasShopId()) { + setShopId(other.shopId); } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); @@ -303,10 +303,10 @@ public final class BuyGoodsScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - shopId = 0; + retcode = 0; goodsBuyTimes = 0; goodsId = 0; - retcode = 0; + shopId = 0; returnItemList.clear(); return this; } @@ -332,33 +332,33 @@ public final class BuyGoodsScRspOuterClass { } BuyGoodsScRsp other = (BuyGoodsScRsp) o; return bitField0_ == other.bitField0_ - && (!hasShopId() || shopId == other.shopId) + && (!hasRetcode() || retcode == other.retcode) && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes) && (!hasGoodsId() || goodsId == other.goodsId) - && (!hasRetcode() || retcode == other.retcode) + && (!hasShopId() || shopId == other.shopId) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(shopId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 50); output.writeMessageNoTag(returnItemList); } } @@ -367,7 +367,7 @@ public final class BuyGoodsScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes); @@ -376,7 +376,7 @@ public final class BuyGoodsScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -391,43 +391,43 @@ public final class BuyGoodsScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // shopId - shopId = input.readUInt32(); + case 8: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 80) { break; } } - case 64: { + case 80: { // goodsBuyTimes goodsBuyTimes = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { + case 104: { // goodsId goodsId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { - // retcode - retcode = input.readUInt32(); + case 120: { + // shopId + shopId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 58) { + if (tag != 50) { break; } } - case 58: { + case 50: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000010; @@ -454,7 +454,7 @@ public final class BuyGoodsScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes); @@ -463,7 +463,7 @@ public final class BuyGoodsScRspOuterClass { output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -478,11 +478,10 @@ public final class BuyGoodsScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -514,10 +513,11 @@ public final class BuyGoodsScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + shopId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -589,13 +589,13 @@ public final class BuyGoodsScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times"); static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName shopId = FieldName.forField("shopId", "shop_id"); static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java index 3719b13..5a9f574 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java @@ -20,7 +20,7 @@ public final class ChallengeBossBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 buff_list = 9; + * repeated uint32 buff_list = 10; */ private final RepeatedInt buffList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class ChallengeBossBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 9; + * repeated uint32 buff_list = 10; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -43,7 +43,7 @@ public final class ChallengeBossBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 9; + * repeated uint32 buff_list = 10; * @return this */ public ChallengeBossBuffInfo clearBuffList() { @@ -53,7 +53,7 @@ public final class ChallengeBossBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 9; + * repeated uint32 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. @@ -67,7 +67,7 @@ public final class ChallengeBossBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 9; + * repeated uint32 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 @@ -81,7 +81,7 @@ public final class ChallengeBossBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 9; + * repeated uint32 buff_list = 10; * @param value the buffList to add * @return this */ @@ -92,7 +92,7 @@ public final class ChallengeBossBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 9; + * repeated uint32 buff_list = 10; * @param values the buffList to add * @return this */ @@ -163,7 +163,7 @@ public final class ChallengeBossBuffInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(buffList.array()[i]); } } @@ -185,7 +185,7 @@ public final class ChallengeBossBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 82: { // buffList [packed=true] input.readPackedUInt32(buffList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class ChallengeBossBuffInfoOuterClass { tag = input.readTag(); break; } - case 72: { + case 80: { // buffList [packed=false] tag = input.readRepeatedUInt32(buffList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java index 38a99f4..541b9d4 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java @@ -14,6 +14,10 @@ import us.hebi.quickbuf.RepeatedInt; public final class ChallengeBossInfoOuterClass { /** + * 
+   *  TODO: verify nodes and lineups
+   *
+ * * Protobuf type {@code ChallengeBossInfo} */ public static final class ChallengeBossInfo extends ProtoMessage implements Cloneable { @@ -21,10 +25,10 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map MPHILJEPBDD = 3;
+     *  map PKADBAODMOL = 6;
      *
* - * optional bool ACGHCDLBCGD = 14; + * optional bool ACGHCDLBCGD = 13; */ private boolean aCGHCDLBCGD; @@ -34,28 +38,32 @@ public final class ChallengeBossInfoOuterClass { private final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo firstNode = ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo.newInstance(); /** - * optional .ChallengeBossSingleNodeInfo second_node = 5; + * optional .ChallengeBossSingleNodeInfo second_node = 15; */ private final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo secondNode = ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo.newInstance(); /** - * 
-     *  map GJPKHDHDCDN = 12;
-     *
- * - * repeated uint32 lineup2 = 2; - */ - private final RepeatedInt lineup2 = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 lineup1 = 11; + * repeated uint32 lineup1 = 3; */ private final RepeatedInt lineup1 = RepeatedInt.newEmptyInstance(); + /** + * 
+     *  map NIDHAKJENJJ = 11;
+     *
+ * + * repeated uint32 lineup2 = 12; + */ + private final RepeatedInt lineup2 = RepeatedInt.newEmptyInstance(); + private ChallengeBossInfo() { } /** + * 
+     *  TODO: verify nodes and lineups
+     *
+ * * @return a new empty instance of {@code ChallengeBossInfo} */ public static ChallengeBossInfo newInstance() { @@ -64,10 +72,10 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map MPHILJEPBDD = 3;
+     *  map PKADBAODMOL = 6;
      *
* - * optional bool ACGHCDLBCGD = 14; + * optional bool ACGHCDLBCGD = 13; * @return whether the aCGHCDLBCGD field is set */ public boolean hasACGHCDLBCGD() { @@ -76,10 +84,10 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map MPHILJEPBDD = 3;
+     *  map PKADBAODMOL = 6;
      *
* - * optional bool ACGHCDLBCGD = 14; + * optional bool ACGHCDLBCGD = 13; * @return this */ public ChallengeBossInfo clearACGHCDLBCGD() { @@ -90,10 +98,10 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map MPHILJEPBDD = 3;
+     *  map PKADBAODMOL = 6;
      *
* - * optional bool ACGHCDLBCGD = 14; + * optional bool ACGHCDLBCGD = 13; * @return the aCGHCDLBCGD */ public boolean getACGHCDLBCGD() { @@ -102,10 +110,10 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map MPHILJEPBDD = 3;
+     *  map PKADBAODMOL = 6;
      *
* - * optional bool ACGHCDLBCGD = 14; + * optional bool ACGHCDLBCGD = 13; * @param value the aCGHCDLBCGD to set * @return this */ @@ -174,7 +182,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * optional .ChallengeBossSingleNodeInfo second_node = 5; + * optional .ChallengeBossSingleNodeInfo second_node = 15; * @return whether the secondNode field is set */ public boolean hasSecondNode() { @@ -182,7 +190,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * optional .ChallengeBossSingleNodeInfo second_node = 5; + * optional .ChallengeBossSingleNodeInfo second_node = 15; * @return this */ public ChallengeBossInfo clearSecondNode() { @@ -192,7 +200,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * optional .ChallengeBossSingleNodeInfo second_node = 5; + * optional .ChallengeBossSingleNodeInfo second_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. @@ -206,7 +214,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * optional .ChallengeBossSingleNodeInfo second_node = 5; + * optional .ChallengeBossSingleNodeInfo second_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 @@ -221,7 +229,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * optional .ChallengeBossSingleNodeInfo second_node = 5; + * optional .ChallengeBossSingleNodeInfo second_node = 15; * @param value the secondNode to set * @return this */ @@ -233,37 +241,105 @@ public final class ChallengeBossInfoOuterClass { } /** - * 
-     *  map GJPKHDHDCDN = 12;
-     *
- * - * repeated uint32 lineup2 = 2; - * @return whether the lineup2 field is set + * repeated uint32 lineup1 = 3; + * @return whether the lineup1 field is set */ - public boolean hasLineup2() { + public boolean hasLineup1() { return (bitField0_ & 0x00000008) != 0; } + /** + * repeated uint32 lineup1 = 3; + * @return this + */ + public ChallengeBossInfo clearLineup1() { + bitField0_ &= ~0x00000008; + lineup1.clear(); + return this; + } + + /** + * repeated uint32 lineup1 = 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 #getMutableLineup1()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getLineup1() { + return lineup1; + } + + /** + * repeated uint32 lineup1 = 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 getMutableLineup1() { + bitField0_ |= 0x00000008; + return lineup1; + } + + /** + * repeated uint32 lineup1 = 3; + * @param value the lineup1 to add + * @return this + */ + public ChallengeBossInfo addLineup1(final int value) { + bitField0_ |= 0x00000008; + lineup1.add(value); + return this; + } + + /** + * repeated uint32 lineup1 = 3; + * @param values the lineup1 to add + * @return this + */ + public ChallengeBossInfo addAllLineup1(final int... values) { + bitField0_ |= 0x00000008; + lineup1.addAll(values); + return this; + } + /** * 
-     *  map GJPKHDHDCDN = 12;
+     *  map NIDHAKJENJJ = 11;
      *
* - * repeated uint32 lineup2 = 2; + * repeated uint32 lineup2 = 12; + * @return whether the lineup2 field is set + */ + public boolean hasLineup2() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * 
+     *  map NIDHAKJENJJ = 11;
+     *
+ * + * repeated uint32 lineup2 = 12; * @return this */ public ChallengeBossInfo clearLineup2() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000010; lineup2.clear(); return this; } /** * 
-     *  map GJPKHDHDCDN = 12;
+     *  map NIDHAKJENJJ = 11;
      *
* - * repeated uint32 lineup2 = 2; + * repeated uint32 lineup2 = 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. @@ -278,10 +354,10 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map GJPKHDHDCDN = 12;
+     *  map NIDHAKJENJJ = 11;
      *
* - * repeated uint32 lineup2 = 2; + * repeated uint32 lineup2 = 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 @@ -290,108 +366,40 @@ public final class ChallengeBossInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableLineup2() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return lineup2; } /** * 
-     *  map GJPKHDHDCDN = 12;
+     *  map NIDHAKJENJJ = 11;
      *
* - * repeated uint32 lineup2 = 2; + * repeated uint32 lineup2 = 12; * @param value the lineup2 to add * @return this */ public ChallengeBossInfo addLineup2(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; lineup2.add(value); return this; } /** * 
-     *  map GJPKHDHDCDN = 12;
+     *  map NIDHAKJENJJ = 11;
      *
* - * repeated uint32 lineup2 = 2; + * repeated uint32 lineup2 = 12; * @param values the lineup2 to add * @return this */ public ChallengeBossInfo addAllLineup2(final int... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; lineup2.addAll(values); return this; } - /** - * repeated uint32 lineup1 = 11; - * @return whether the lineup1 field is set - */ - public boolean hasLineup1() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 lineup1 = 11; - * @return this - */ - public ChallengeBossInfo clearLineup1() { - bitField0_ &= ~0x00000010; - lineup1.clear(); - return this; - } - - /** - * repeated uint32 lineup1 = 11; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableLineup1()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getLineup1() { - return lineup1; - } - - /** - * repeated uint32 lineup1 = 11; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * 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 = 11; - * @param value the lineup1 to add - * @return this - */ - public ChallengeBossInfo addLineup1(final int value) { - bitField0_ |= 0x00000010; - lineup1.add(value); - return this; - } - - /** - * repeated uint32 lineup1 = 11; - * @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; @@ -400,8 +408,8 @@ public final class ChallengeBossInfoOuterClass { aCGHCDLBCGD = other.aCGHCDLBCGD; firstNode.copyFrom(other.firstNode); secondNode.copyFrom(other.secondNode); - lineup2.copyFrom(other.lineup2); lineup1.copyFrom(other.lineup1); + lineup2.copyFrom(other.lineup2); } return this; } @@ -421,12 +429,12 @@ public final class ChallengeBossInfoOuterClass { if (other.hasSecondNode()) { getMutableSecondNode().mergeFrom(other.secondNode); } - if (other.hasLineup2()) { - getMutableLineup2().addAll(other.lineup2); - } if (other.hasLineup1()) { getMutableLineup1().addAll(other.lineup1); } + if (other.hasLineup2()) { + getMutableLineup2().addAll(other.lineup2); + } return this; } @@ -440,8 +448,8 @@ public final class ChallengeBossInfoOuterClass { aCGHCDLBCGD = false; firstNode.clear(); secondNode.clear(); - lineup2.clear(); lineup1.clear(); + lineup2.clear(); return this; } @@ -454,8 +462,8 @@ public final class ChallengeBossInfoOuterClass { bitField0_ = 0; firstNode.clearQuick(); secondNode.clearQuick(); - lineup2.clear(); lineup1.clear(); + lineup2.clear(); return this; } @@ -472,14 +480,14 @@ public final class ChallengeBossInfoOuterClass { && (!hasACGHCDLBCGD() || aCGHCDLBCGD == other.aCGHCDLBCGD) && (!hasFirstNode() || firstNode.equals(other.firstNode)) && (!hasSecondNode() || secondNode.equals(other.secondNode)) - && (!hasLineup2() || lineup2.equals(other.lineup2)) - && (!hasLineup1() || lineup1.equals(other.lineup1)); + && (!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) 112); + output.writeRawByte((byte) 104); output.writeBoolNoTag(aCGHCDLBCGD); } if ((bitField0_ & 0x00000002) != 0) { @@ -487,19 +495,19 @@ public final class ChallengeBossInfoOuterClass { output.writeMessageNoTag(firstNode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 122); output.writeMessageNoTag(secondNode); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < lineup2.length(); i++) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(lineup2.array()[i]); + for (int i = 0; i < lineup1.length(); i++) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(lineup1.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < lineup1.length(); i++) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(lineup1.array()[i]); + for (int i = 0; i < lineup2.length(); i++) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(lineup2.array()[i]); } } } @@ -517,10 +525,10 @@ public final class ChallengeBossInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(secondNode); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * lineup2.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup2); + size += (1 * lineup1.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup1); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * lineup1.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup1); + size += (1 * lineup2.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup2); } return size; } @@ -532,7 +540,7 @@ public final class ChallengeBossInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 104: { // aCGHCDLBCGD aCGHCDLBCGD = input.readBool(); bitField0_ |= 0x00000001; @@ -546,31 +554,31 @@ public final class ChallengeBossInfoOuterClass { input.readMessage(firstNode); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 122) { break; } } - case 42: { + case 122: { // secondNode input.readMessage(secondNode); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 18) { + if (tag != 26) { break; } } - case 18: { - // lineup2 [packed=true] - input.readPackedUInt32(lineup2, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { + case 26: { // lineup1 [packed=true] input.readPackedUInt32(lineup1, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // lineup2 [packed=true] + input.readPackedUInt32(lineup2, tag); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -587,15 +595,15 @@ public final class ChallengeBossInfoOuterClass { tag = input.readTag(); break; } - case 16: { - // lineup2 [packed=false] - tag = input.readRepeatedUInt32(lineup2, tag); + case 24: { + // lineup1 [packed=false] + tag = input.readRepeatedUInt32(lineup1, tag); bitField0_ |= 0x00000008; break; } - case 88: { - // lineup1 [packed=false] - tag = input.readRepeatedUInt32(lineup1, tag); + case 96: { + // lineup2 [packed=false] + tag = input.readRepeatedUInt32(lineup2, tag); bitField0_ |= 0x00000010; break; } @@ -616,10 +624,10 @@ public final class ChallengeBossInfoOuterClass { output.writeMessage(FieldNames.secondNode, secondNode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.lineup2, lineup2); + output.writeRepeatedUInt32(FieldNames.lineup1, lineup1); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.lineup1, lineup1); + output.writeRepeatedUInt32(FieldNames.lineup2, lineup2); } output.endObject(); } @@ -666,10 +674,10 @@ public final class ChallengeBossInfoOuterClass { } break; } - case 176922755: { - if (input.isAtField(FieldNames.lineup2)) { + case 176922754: { + if (input.isAtField(FieldNames.lineup1)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(lineup2); + input.readRepeatedUInt32(lineup1); bitField0_ |= 0x00000008; } } else { @@ -677,10 +685,10 @@ public final class ChallengeBossInfoOuterClass { } break; } - case 176922754: { - if (input.isAtField(FieldNames.lineup1)) { + case 176922755: { + if (input.isAtField(FieldNames.lineup2)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(lineup1); + input.readRepeatedUInt32(lineup2); bitField0_ |= 0x00000010; } } else { @@ -747,9 +755,9 @@ public final class ChallengeBossInfoOuterClass { static final FieldName secondNode = FieldName.forField("secondNode", "second_node"); - static final FieldName lineup2 = FieldName.forField("lineup2"); - static final FieldName lineup1 = FieldName.forField("lineup1"); + + static final FieldName lineup2 = FieldName.forField("lineup2"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeBossPhaseSettleNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeBossPhaseSettleNotifyOuterClass.java index 5812aae..22f4489 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeBossPhaseSettleNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossPhaseSettleNotifyOuterClass.java @@ -20,52 +20,52 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 COKFJJOLMDI = 3; - */ - private int cOKFJJOLMDI; - - /** - * optional uint32 challenge_score = 6; - */ - private int challengeScore; - - /** - * optional uint32 phase = 8; - */ - private int phase; - - /** - * optional uint32 stars = 9; - */ - private int stars; - - /** - * optional uint32 challenge_id = 10; - */ - private int challengeId; - - /** - * optional uint32 score_two = 14; + * optional uint32 score_two = 2; */ private int scoreTwo; /** - * optional bool is_win = 1; + * optional uint32 challenge_score = 3; */ - private boolean isWin; + private int challengeScore; /** - * optional bool unkbool1 = 2; + * optional uint32 stars = 4; + */ + private int stars; + + /** + * optional uint32 COKFJJOLMDI = 12; + */ + private int cOKFJJOLMDI; + + /** + * optional uint32 challenge_id = 13; + */ + private int challengeId; + + /** + * optional uint32 phase = 14; + */ + private int phase; + + /** + * optional bool unkbool1 = 7; */ private boolean unkbool1; + /** + * optional bool is_win = 11; + */ + private boolean isWin; + /** * optional bool unkbool2 = 15; */ private boolean unkbool2; /** - * repeated .BattleTarget BIPEPADLEIA = 7; + * repeated .BattleTarget BIPEPADLEIA = 1; */ private final RepeatedMessage bIPEPADLEIA = RepeatedMessage.newEmptyInstance(BattleTargetOuterClass.BattleTarget.getFactory()); @@ -80,44 +80,44 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 COKFJJOLMDI = 3; - * @return whether the cOKFJJOLMDI field is set + * optional uint32 score_two = 2; + * @return whether the scoreTwo field is set */ - public boolean hasCOKFJJOLMDI() { + public boolean hasScoreTwo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 COKFJJOLMDI = 3; + * optional uint32 score_two = 2; * @return this */ - public ChallengeBossPhaseSettleNotify clearCOKFJJOLMDI() { + public ChallengeBossPhaseSettleNotify clearScoreTwo() { bitField0_ &= ~0x00000001; - cOKFJJOLMDI = 0; + scoreTwo = 0; return this; } /** - * optional uint32 COKFJJOLMDI = 3; - * @return the cOKFJJOLMDI + * optional uint32 score_two = 2; + * @return the scoreTwo */ - public int getCOKFJJOLMDI() { - return cOKFJJOLMDI; + public int getScoreTwo() { + return scoreTwo; } /** - * optional uint32 COKFJJOLMDI = 3; - * @param value the cOKFJJOLMDI to set + * optional uint32 score_two = 2; + * @param value the scoreTwo to set * @return this */ - public ChallengeBossPhaseSettleNotify setCOKFJJOLMDI(final int value) { + public ChallengeBossPhaseSettleNotify setScoreTwo(final int value) { bitField0_ |= 0x00000001; - cOKFJJOLMDI = value; + scoreTwo = value; return this; } /** - * optional uint32 challenge_score = 6; + * optional uint32 challenge_score = 3; * @return whether the challengeScore field is set */ public boolean hasChallengeScore() { @@ -125,7 +125,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 challenge_score = 6; + * optional uint32 challenge_score = 3; * @return this */ public ChallengeBossPhaseSettleNotify clearChallengeScore() { @@ -135,7 +135,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 challenge_score = 6; + * optional uint32 challenge_score = 3; * @return the challengeScore */ public int getChallengeScore() { @@ -143,7 +143,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 challenge_score = 6; + * optional uint32 challenge_score = 3; * @param value the challengeScore to set * @return this */ @@ -154,62 +154,25 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 phase = 8; - * @return whether the phase field is set + * optional uint32 stars = 4; + * @return whether the stars field is set */ - public boolean hasPhase() { + public boolean hasStars() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 phase = 8; - * @return this - */ - public ChallengeBossPhaseSettleNotify clearPhase() { - bitField0_ &= ~0x00000004; - phase = 0; - return this; - } - - /** - * optional uint32 phase = 8; - * @return the phase - */ - public int getPhase() { - return phase; - } - - /** - * optional uint32 phase = 8; - * @param value the phase to set - * @return this - */ - public ChallengeBossPhaseSettleNotify setPhase(final int value) { - bitField0_ |= 0x00000004; - phase = value; - return this; - } - - /** - * optional uint32 stars = 9; - * @return whether the stars field is set - */ - public boolean hasStars() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 stars = 9; + * optional uint32 stars = 4; * @return this */ public ChallengeBossPhaseSettleNotify clearStars() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; stars = 0; return this; } /** - * optional uint32 stars = 9; + * optional uint32 stars = 4; * @return the stars */ public int getStars() { @@ -217,18 +180,55 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 stars = 9; + * optional uint32 stars = 4; * @param value the stars to set * @return this */ public ChallengeBossPhaseSettleNotify setStars(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; stars = value; return this; } /** - * optional uint32 challenge_id = 10; + * optional uint32 COKFJJOLMDI = 12; + * @return whether the cOKFJJOLMDI field is set + */ + public boolean hasCOKFJJOLMDI() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 COKFJJOLMDI = 12; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearCOKFJJOLMDI() { + bitField0_ &= ~0x00000008; + cOKFJJOLMDI = 0; + return this; + } + + /** + * optional uint32 COKFJJOLMDI = 12; + * @return the cOKFJJOLMDI + */ + public int getCOKFJJOLMDI() { + return cOKFJJOLMDI; + } + + /** + * optional uint32 COKFJJOLMDI = 12; + * @param value the cOKFJJOLMDI to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setCOKFJJOLMDI(final int value) { + bitField0_ |= 0x00000008; + cOKFJJOLMDI = value; + return this; + } + + /** + * optional uint32 challenge_id = 13; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -236,7 +236,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 10; + * optional uint32 challenge_id = 13; * @return this */ public ChallengeBossPhaseSettleNotify clearChallengeId() { @@ -246,7 +246,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 10; + * optional uint32 challenge_id = 13; * @return the challengeId */ public int getChallengeId() { @@ -254,7 +254,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 10; + * optional uint32 challenge_id = 13; * @param value the challengeId to set * @return this */ @@ -265,99 +265,62 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional uint32 score_two = 14; - * @return whether the scoreTwo field is set + * optional uint32 phase = 14; + * @return whether the phase field is set */ - public boolean hasScoreTwo() { + public boolean hasPhase() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 score_two = 14; + * optional uint32 phase = 14; * @return this */ - public ChallengeBossPhaseSettleNotify clearScoreTwo() { + public ChallengeBossPhaseSettleNotify clearPhase() { bitField0_ &= ~0x00000020; - scoreTwo = 0; + phase = 0; return this; } /** - * optional uint32 score_two = 14; - * @return the scoreTwo + * optional uint32 phase = 14; + * @return the phase */ - public int getScoreTwo() { - return scoreTwo; + public int getPhase() { + return phase; } /** - * optional uint32 score_two = 14; - * @param value the scoreTwo to set + * optional uint32 phase = 14; + * @param value the phase to set * @return this */ - public ChallengeBossPhaseSettleNotify setScoreTwo(final int value) { + public ChallengeBossPhaseSettleNotify setPhase(final int value) { bitField0_ |= 0x00000020; - scoreTwo = value; + phase = value; return this; } /** - * optional bool is_win = 1; - * @return whether the isWin field is set + * optional bool unkbool1 = 7; + * @return whether the unkbool1 field is set */ - public boolean hasIsWin() { + public boolean hasUnkbool1() { return (bitField0_ & 0x00000040) != 0; } /** - * optional bool is_win = 1; - * @return this - */ - public ChallengeBossPhaseSettleNotify clearIsWin() { - bitField0_ &= ~0x00000040; - isWin = false; - return this; - } - - /** - * optional bool is_win = 1; - * @return the isWin - */ - public boolean getIsWin() { - return isWin; - } - - /** - * optional bool is_win = 1; - * @param value the isWin to set - * @return this - */ - public ChallengeBossPhaseSettleNotify setIsWin(final boolean value) { - bitField0_ |= 0x00000040; - isWin = value; - return this; - } - - /** - * optional bool unkbool1 = 2; - * @return whether the unkbool1 field is set - */ - public boolean hasUnkbool1() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional bool unkbool1 = 2; + * optional bool unkbool1 = 7; * @return this */ public ChallengeBossPhaseSettleNotify clearUnkbool1() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; unkbool1 = false; return this; } /** - * optional bool unkbool1 = 2; + * optional bool unkbool1 = 7; * @return the unkbool1 */ public boolean getUnkbool1() { @@ -365,16 +328,53 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * optional bool unkbool1 = 2; + * optional bool unkbool1 = 7; * @param value the unkbool1 to set * @return this */ public ChallengeBossPhaseSettleNotify setUnkbool1(final boolean value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; unkbool1 = value; return this; } + /** + * optional bool is_win = 11; + * @return whether the isWin field is set + */ + public boolean hasIsWin() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional bool is_win = 11; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearIsWin() { + bitField0_ &= ~0x00000080; + isWin = false; + return this; + } + + /** + * optional bool is_win = 11; + * @return the isWin + */ + public boolean getIsWin() { + return isWin; + } + + /** + * optional bool is_win = 11; + * @param value the isWin to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setIsWin(final boolean value) { + bitField0_ |= 0x00000080; + isWin = value; + return this; + } + /** * optional bool unkbool2 = 15; * @return whether the unkbool2 field is set @@ -413,7 +413,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * repeated .BattleTarget BIPEPADLEIA = 7; + * repeated .BattleTarget BIPEPADLEIA = 1; * @return whether the bIPEPADLEIA field is set */ public boolean hasBIPEPADLEIA() { @@ -421,7 +421,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * repeated .BattleTarget BIPEPADLEIA = 7; + * repeated .BattleTarget BIPEPADLEIA = 1; * @return this */ public ChallengeBossPhaseSettleNotify clearBIPEPADLEIA() { @@ -431,7 +431,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * repeated .BattleTarget BIPEPADLEIA = 7; + * repeated .BattleTarget BIPEPADLEIA = 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. @@ -445,7 +445,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * repeated .BattleTarget BIPEPADLEIA = 7; + * repeated .BattleTarget BIPEPADLEIA = 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 @@ -459,7 +459,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * repeated .BattleTarget BIPEPADLEIA = 7; + * repeated .BattleTarget BIPEPADLEIA = 1; * @param value the bIPEPADLEIA to add * @return this */ @@ -471,7 +471,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } /** - * repeated .BattleTarget BIPEPADLEIA = 7; + * repeated .BattleTarget BIPEPADLEIA = 1; * @param values the bIPEPADLEIA to add * @return this */ @@ -487,14 +487,14 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - cOKFJJOLMDI = other.cOKFJJOLMDI; - challengeScore = other.challengeScore; - phase = other.phase; - stars = other.stars; - challengeId = other.challengeId; scoreTwo = other.scoreTwo; - isWin = other.isWin; + challengeScore = other.challengeScore; + stars = other.stars; + cOKFJJOLMDI = other.cOKFJJOLMDI; + challengeId = other.challengeId; + phase = other.phase; unkbool1 = other.unkbool1; + isWin = other.isWin; unkbool2 = other.unkbool2; bIPEPADLEIA.copyFrom(other.bIPEPADLEIA); } @@ -507,30 +507,30 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasCOKFJJOLMDI()) { - setCOKFJJOLMDI(other.cOKFJJOLMDI); + if (other.hasScoreTwo()) { + setScoreTwo(other.scoreTwo); } if (other.hasChallengeScore()) { setChallengeScore(other.challengeScore); } - if (other.hasPhase()) { - setPhase(other.phase); - } if (other.hasStars()) { setStars(other.stars); } + if (other.hasCOKFJJOLMDI()) { + setCOKFJJOLMDI(other.cOKFJJOLMDI); + } if (other.hasChallengeId()) { setChallengeId(other.challengeId); } - if (other.hasScoreTwo()) { - setScoreTwo(other.scoreTwo); - } - if (other.hasIsWin()) { - setIsWin(other.isWin); + if (other.hasPhase()) { + setPhase(other.phase); } if (other.hasUnkbool1()) { setUnkbool1(other.unkbool1); } + if (other.hasIsWin()) { + setIsWin(other.isWin); + } if (other.hasUnkbool2()) { setUnkbool2(other.unkbool2); } @@ -547,14 +547,14 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - cOKFJJOLMDI = 0; - challengeScore = 0; - phase = 0; - stars = 0; - challengeId = 0; scoreTwo = 0; - isWin = false; + challengeScore = 0; + stars = 0; + cOKFJJOLMDI = 0; + challengeId = 0; + phase = 0; unkbool1 = false; + isWin = false; unkbool2 = false; bIPEPADLEIA.clear(); return this; @@ -581,14 +581,14 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } ChallengeBossPhaseSettleNotify other = (ChallengeBossPhaseSettleNotify) o; return bitField0_ == other.bitField0_ - && (!hasCOKFJJOLMDI() || cOKFJJOLMDI == other.cOKFJJOLMDI) - && (!hasChallengeScore() || challengeScore == other.challengeScore) - && (!hasPhase() || phase == other.phase) - && (!hasStars() || stars == other.stars) - && (!hasChallengeId() || challengeId == other.challengeId) && (!hasScoreTwo() || scoreTwo == other.scoreTwo) - && (!hasIsWin() || isWin == other.isWin) + && (!hasChallengeScore() || challengeScore == other.challengeScore) + && (!hasStars() || stars == other.stars) + && (!hasCOKFJJOLMDI() || cOKFJJOLMDI == other.cOKFJJOLMDI) + && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasPhase() || phase == other.phase) && (!hasUnkbool1() || unkbool1 == other.unkbool1) + && (!hasIsWin() || isWin == other.isWin) && (!hasUnkbool2() || unkbool2 == other.unkbool2) && (!hasBIPEPADLEIA() || bIPEPADLEIA.equals(other.bIPEPADLEIA)); } @@ -596,36 +596,36 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(cOKFJJOLMDI); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(challengeScore); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(phase); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(stars); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(cOKFJJOLMDI); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(scoreTwo); + output.writeUInt32NoTag(phase); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 8); - output.writeBoolNoTag(isWin); + output.writeRawByte((byte) 56); + output.writeBoolNoTag(unkbool1); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 16); - output.writeBoolNoTag(unkbool1); + output.writeRawByte((byte) 88); + output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000100) != 0) { output.writeRawByte((byte) 120); @@ -633,7 +633,7 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < bIPEPADLEIA.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 10); output.writeMessageNoTag(bIPEPADLEIA.get(i)); } } @@ -643,22 +643,22 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cOKFJJOLMDI); + size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(phase); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cOKFJJOLMDI); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); + size += 1 + ProtoSink.computeUInt32SizeNoTag(phase); } if ((bitField0_ & 0x00000040) != 0) { size += 2; @@ -682,43 +682,43 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // cOKFJJOLMDI - cOKFJJOLMDI = input.readUInt32(); + case 16: { + // scoreTwo + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 24) { break; } } - case 48: { + case 24: { // challengeScore challengeScore = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { - // phase - phase = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 32: { // stars stars = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 96) { break; } } - case 80: { + case 96: { + // cOKFJJOLMDI + cOKFJJOLMDI = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000010; @@ -728,26 +728,26 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } } case 112: { - // scoreTwo - scoreTwo = input.readUInt32(); + // phase + phase = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 8) { + if (tag != 56) { break; } } - case 8: { - // isWin - isWin = input.readBool(); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { + case 56: { // unkbool1 unkbool1 = input.readBool(); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // isWin + isWin = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 120) { @@ -759,11 +759,11 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { unkbool2 = input.readBool(); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { + case 10: { // bIPEPADLEIA tag = input.readRepeatedMessage(bIPEPADLEIA, tag); bitField0_ |= 0x00000200; @@ -789,28 +789,28 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.cOKFJJOLMDI, cOKFJJOLMDI); + output.writeUInt32(FieldNames.scoreTwo, scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.challengeScore, challengeScore); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.phase, phase); + output.writeUInt32(FieldNames.stars, stars); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.stars, stars); + output.writeUInt32(FieldNames.cOKFJJOLMDI, cOKFJJOLMDI); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.scoreTwo, scoreTwo); + output.writeUInt32(FieldNames.phase, phase); } if ((bitField0_ & 0x00000040) != 0) { - output.writeBool(FieldNames.isWin, isWin); + output.writeBool(FieldNames.unkbool1, unkbool1); } if ((bitField0_ & 0x00000080) != 0) { - output.writeBool(FieldNames.unkbool1, unkbool1); + output.writeBool(FieldNames.isWin, isWin); } if ((bitField0_ & 0x00000100) != 0) { output.writeBool(FieldNames.unkbool2, unkbool2); @@ -828,10 +828,11 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -9162578: { - if (input.isAtField(FieldNames.cOKFJJOLMDI)) { + case -485512614: + case 2129303327: { + if (input.isAtField(FieldNames.scoreTwo)) { if (!input.trySkipNullValue()) { - cOKFJJOLMDI = input.readUInt32(); + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -851,10 +852,10 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } break; } - case 106629499: { - if (input.isAtField(FieldNames.phase)) { + case 109757537: { + if (input.isAtField(FieldNames.stars)) { if (!input.trySkipNullValue()) { - phase = input.readUInt32(); + stars = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -862,10 +863,10 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } break; } - case 109757537: { - if (input.isAtField(FieldNames.stars)) { + case -9162578: { + if (input.isAtField(FieldNames.cOKFJJOLMDI)) { if (!input.trySkipNullValue()) { - stars = input.readUInt32(); + cOKFJJOLMDI = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -885,11 +886,10 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } break; } - case -485512614: - case 2129303327: { - if (input.isAtField(FieldNames.scoreTwo)) { + case 106629499: { + if (input.isAtField(FieldNames.phase)) { if (!input.trySkipNullValue()) { - scoreTwo = input.readUInt32(); + phase = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -897,22 +897,22 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { } break; } + case -251222827: { + if (input.isAtField(FieldNames.unkbool1)) { + if (!input.trySkipNullValue()) { + unkbool1 = input.readBool(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } case 100482642: case -1179753657: { if (input.isAtField(FieldNames.isWin)) { if (!input.trySkipNullValue()) { isWin = input.readBool(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case -251222827: { - if (input.isAtField(FieldNames.unkbool1)) { - if (!input.trySkipNullValue()) { - unkbool1 = input.readBool(); bitField0_ |= 0x00000080; } } else { @@ -997,22 +997,22 @@ public final class ChallengeBossPhaseSettleNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName cOKFJJOLMDI = FieldName.forField("COKFJJOLMDI"); + static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score"); - static final FieldName phase = FieldName.forField("phase"); - static final FieldName stars = FieldName.forField("stars"); + static final FieldName cOKFJJOLMDI = FieldName.forField("COKFJJOLMDI"); + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); - static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); - - static final FieldName isWin = FieldName.forField("isWin", "is_win"); + static final FieldName phase = FieldName.forField("phase"); static final FieldName unkbool1 = FieldName.forField("unkbool1"); + static final FieldName isWin = FieldName.forField("isWin", "is_win"); + static final FieldName unkbool2 = FieldName.forField("unkbool2"); static final FieldName bIPEPADLEIA = FieldName.forField("BIPEPADLEIA"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeBossSingleNodeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeBossSingleNodeInfoOuterClass.java index 48f9970..50502c4 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeBossSingleNodeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossSingleNodeInfoOuterClass.java @@ -19,24 +19,24 @@ public final class ChallengeBossSingleNodeInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 KLJPBAAGNFN = 11; + * optional uint32 buff_id = 3; */ - private int kLJPBAAGNFN; + private int buffId; /** - * optional uint32 DAIMOOEMHJF = 14; + * optional uint32 max_score = 14; */ - private int dAIMOOEMHJF; + private int maxScore; /** - * optional bool BMIKMFLHMJD = 5; + * optional bool is_win = 12; */ - private boolean bMIKMFLHMJD; + private boolean isWin; /** - * optional bool NAGJMPMHMMC = 7; + * optional bool has_been_challenged = 13; */ - private boolean nAGJMPMHMMC; + private boolean hasBeenChallenged; private ChallengeBossSingleNodeInfo() { } @@ -49,150 +49,150 @@ public final class ChallengeBossSingleNodeInfoOuterClass { } /** - * optional uint32 KLJPBAAGNFN = 11; - * @return whether the kLJPBAAGNFN field is set + * optional uint32 buff_id = 3; + * @return whether the buffId field is set */ - public boolean hasKLJPBAAGNFN() { + public boolean hasBuffId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 KLJPBAAGNFN = 11; + * optional uint32 buff_id = 3; * @return this */ - public ChallengeBossSingleNodeInfo clearKLJPBAAGNFN() { + public ChallengeBossSingleNodeInfo clearBuffId() { bitField0_ &= ~0x00000001; - kLJPBAAGNFN = 0; + buffId = 0; return this; } /** - * optional uint32 KLJPBAAGNFN = 11; - * @return the kLJPBAAGNFN + * optional uint32 buff_id = 3; + * @return the buffId */ - public int getKLJPBAAGNFN() { - return kLJPBAAGNFN; + public int getBuffId() { + return buffId; } /** - * optional uint32 KLJPBAAGNFN = 11; - * @param value the kLJPBAAGNFN to set + * optional uint32 buff_id = 3; + * @param value the buffId to set * @return this */ - public ChallengeBossSingleNodeInfo setKLJPBAAGNFN(final int value) { + public ChallengeBossSingleNodeInfo setBuffId(final int value) { bitField0_ |= 0x00000001; - kLJPBAAGNFN = value; + buffId = value; return this; } /** - * optional uint32 DAIMOOEMHJF = 14; - * @return whether the dAIMOOEMHJF field is set + * optional uint32 max_score = 14; + * @return whether the maxScore field is set */ - public boolean hasDAIMOOEMHJF() { + public boolean hasMaxScore() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 DAIMOOEMHJF = 14; + * optional uint32 max_score = 14; * @return this */ - public ChallengeBossSingleNodeInfo clearDAIMOOEMHJF() { + public ChallengeBossSingleNodeInfo clearMaxScore() { bitField0_ &= ~0x00000002; - dAIMOOEMHJF = 0; + maxScore = 0; return this; } /** - * optional uint32 DAIMOOEMHJF = 14; - * @return the dAIMOOEMHJF + * optional uint32 max_score = 14; + * @return the maxScore */ - public int getDAIMOOEMHJF() { - return dAIMOOEMHJF; + public int getMaxScore() { + return maxScore; } /** - * optional uint32 DAIMOOEMHJF = 14; - * @param value the dAIMOOEMHJF to set + * optional uint32 max_score = 14; + * @param value the maxScore to set * @return this */ - public ChallengeBossSingleNodeInfo setDAIMOOEMHJF(final int value) { + public ChallengeBossSingleNodeInfo setMaxScore(final int value) { bitField0_ |= 0x00000002; - dAIMOOEMHJF = value; + maxScore = value; return this; } /** - * optional bool BMIKMFLHMJD = 5; - * @return whether the bMIKMFLHMJD field is set + * optional bool is_win = 12; + * @return whether the isWin field is set */ - public boolean hasBMIKMFLHMJD() { + public boolean hasIsWin() { return (bitField0_ & 0x00000004) != 0; } /** - * optional bool BMIKMFLHMJD = 5; + * optional bool is_win = 12; * @return this */ - public ChallengeBossSingleNodeInfo clearBMIKMFLHMJD() { + public ChallengeBossSingleNodeInfo clearIsWin() { bitField0_ &= ~0x00000004; - bMIKMFLHMJD = false; + isWin = false; return this; } /** - * optional bool BMIKMFLHMJD = 5; - * @return the bMIKMFLHMJD + * optional bool is_win = 12; + * @return the isWin */ - public boolean getBMIKMFLHMJD() { - return bMIKMFLHMJD; + public boolean getIsWin() { + return isWin; } /** - * optional bool BMIKMFLHMJD = 5; - * @param value the bMIKMFLHMJD to set + * optional bool is_win = 12; + * @param value the isWin to set * @return this */ - public ChallengeBossSingleNodeInfo setBMIKMFLHMJD(final boolean value) { + public ChallengeBossSingleNodeInfo setIsWin(final boolean value) { bitField0_ |= 0x00000004; - bMIKMFLHMJD = value; + isWin = value; return this; } /** - * optional bool NAGJMPMHMMC = 7; - * @return whether the nAGJMPMHMMC field is set + * optional bool has_been_challenged = 13; + * @return whether the hasBeenChallenged field is set */ - public boolean hasNAGJMPMHMMC() { + public boolean hasHasBeenChallenged() { return (bitField0_ & 0x00000008) != 0; } /** - * optional bool NAGJMPMHMMC = 7; + * optional bool has_been_challenged = 13; * @return this */ - public ChallengeBossSingleNodeInfo clearNAGJMPMHMMC() { + public ChallengeBossSingleNodeInfo clearHasBeenChallenged() { bitField0_ &= ~0x00000008; - nAGJMPMHMMC = false; + hasBeenChallenged = false; return this; } /** - * optional bool NAGJMPMHMMC = 7; - * @return the nAGJMPMHMMC + * optional bool has_been_challenged = 13; + * @return the hasBeenChallenged */ - public boolean getNAGJMPMHMMC() { - return nAGJMPMHMMC; + public boolean getHasBeenChallenged() { + return hasBeenChallenged; } /** - * optional bool NAGJMPMHMMC = 7; - * @param value the nAGJMPMHMMC to set + * optional bool has_been_challenged = 13; + * @param value the hasBeenChallenged to set * @return this */ - public ChallengeBossSingleNodeInfo setNAGJMPMHMMC(final boolean value) { + public ChallengeBossSingleNodeInfo setHasBeenChallenged(final boolean value) { bitField0_ |= 0x00000008; - nAGJMPMHMMC = value; + hasBeenChallenged = value; return this; } @@ -201,10 +201,10 @@ public final class ChallengeBossSingleNodeInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - kLJPBAAGNFN = other.kLJPBAAGNFN; - dAIMOOEMHJF = other.dAIMOOEMHJF; - bMIKMFLHMJD = other.bMIKMFLHMJD; - nAGJMPMHMMC = other.nAGJMPMHMMC; + buffId = other.buffId; + maxScore = other.maxScore; + isWin = other.isWin; + hasBeenChallenged = other.hasBeenChallenged; } return this; } @@ -215,17 +215,17 @@ public final class ChallengeBossSingleNodeInfoOuterClass { return this; } cachedSize = -1; - if (other.hasKLJPBAAGNFN()) { - setKLJPBAAGNFN(other.kLJPBAAGNFN); + if (other.hasBuffId()) { + setBuffId(other.buffId); } - if (other.hasDAIMOOEMHJF()) { - setDAIMOOEMHJF(other.dAIMOOEMHJF); + if (other.hasMaxScore()) { + setMaxScore(other.maxScore); } - if (other.hasBMIKMFLHMJD()) { - setBMIKMFLHMJD(other.bMIKMFLHMJD); + if (other.hasIsWin()) { + setIsWin(other.isWin); } - if (other.hasNAGJMPMHMMC()) { - setNAGJMPMHMMC(other.nAGJMPMHMMC); + if (other.hasHasBeenChallenged()) { + setHasBeenChallenged(other.hasBeenChallenged); } return this; } @@ -237,10 +237,10 @@ public final class ChallengeBossSingleNodeInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - kLJPBAAGNFN = 0; - dAIMOOEMHJF = 0; - bMIKMFLHMJD = false; - nAGJMPMHMMC = false; + buffId = 0; + maxScore = 0; + isWin = false; + hasBeenChallenged = false; return this; } @@ -264,29 +264,29 @@ public final class ChallengeBossSingleNodeInfoOuterClass { } ChallengeBossSingleNodeInfo other = (ChallengeBossSingleNodeInfo) o; return bitField0_ == other.bitField0_ - && (!hasKLJPBAAGNFN() || kLJPBAAGNFN == other.kLJPBAAGNFN) - && (!hasDAIMOOEMHJF() || dAIMOOEMHJF == other.dAIMOOEMHJF) - && (!hasBMIKMFLHMJD() || bMIKMFLHMJD == other.bMIKMFLHMJD) - && (!hasNAGJMPMHMMC() || nAGJMPMHMMC == other.nAGJMPMHMMC); + && (!hasBuffId() || buffId == other.buffId) + && (!hasMaxScore() || maxScore == other.maxScore) + && (!hasIsWin() || isWin == other.isWin) + && (!hasHasBeenChallenged() || hasBeenChallenged == other.hasBeenChallenged); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(kLJPBAAGNFN); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(dAIMOOEMHJF); + output.writeUInt32NoTag(maxScore); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeBoolNoTag(bMIKMFLHMJD); + output.writeRawByte((byte) 96); + output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); - output.writeBoolNoTag(nAGJMPMHMMC); + output.writeRawByte((byte) 104); + output.writeBoolNoTag(hasBeenChallenged); } } @@ -294,10 +294,10 @@ public final class ChallengeBossSingleNodeInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kLJPBAAGNFN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dAIMOOEMHJF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxScore); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -315,9 +315,9 @@ public final class ChallengeBossSingleNodeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // kLJPBAAGNFN - kLJPBAAGNFN = input.readUInt32(); + case 24: { + // buffId + buffId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 112) { @@ -325,26 +325,26 @@ public final class ChallengeBossSingleNodeInfoOuterClass { } } case 112: { - // dAIMOOEMHJF - dAIMOOEMHJF = input.readUInt32(); + // maxScore + maxScore = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { - // bMIKMFLHMJD - bMIKMFLHMJD = input.readBool(); + case 96: { + // isWin + isWin = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 56) { + if (tag != 104) { break; } } - case 56: { - // nAGJMPMHMMC - nAGJMPMHMMC = input.readBool(); + case 104: { + // hasBeenChallenged + hasBeenChallenged = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class ChallengeBossSingleNodeInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.kLJPBAAGNFN, kLJPBAAGNFN); + output.writeUInt32(FieldNames.buffId, buffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dAIMOOEMHJF, dAIMOOEMHJF); + output.writeUInt32(FieldNames.maxScore, maxScore); } if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.bMIKMFLHMJD, bMIKMFLHMJD); + output.writeBool(FieldNames.isWin, isWin); } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.nAGJMPMHMMC, nAGJMPMHMMC); + output.writeBool(FieldNames.hasBeenChallenged, hasBeenChallenged); } output.endObject(); } @@ -390,10 +390,11 @@ public final class ChallengeBossSingleNodeInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1930444150: { - if (input.isAtField(FieldNames.kLJPBAAGNFN)) { + case -1378119474: + case 227990663: { + if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { - kLJPBAAGNFN = input.readUInt32(); + buffId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -401,10 +402,11 @@ public final class ChallengeBossSingleNodeInfoOuterClass { } break; } - case -143725957: { - if (input.isAtField(FieldNames.dAIMOOEMHJF)) { + case 396519310: + case -234837001: { + if (input.isAtField(FieldNames.maxScore)) { if (!input.trySkipNullValue()) { - dAIMOOEMHJF = input.readUInt32(); + maxScore = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +414,11 @@ public final class ChallengeBossSingleNodeInfoOuterClass { } break; } - case -124987899: { - if (input.isAtField(FieldNames.bMIKMFLHMJD)) { + case 100482642: + case -1179753657: { + if (input.isAtField(FieldNames.isWin)) { if (!input.trySkipNullValue()) { - bMIKMFLHMJD = input.readBool(); + isWin = input.readBool(); bitField0_ |= 0x00000004; } } else { @@ -423,10 +426,11 @@ public final class ChallengeBossSingleNodeInfoOuterClass { } break; } - case 8940751: { - if (input.isAtField(FieldNames.nAGJMPMHMMC)) { + case -1986428185: + case 1158132399: { + if (input.isAtField(FieldNames.hasBeenChallenged)) { if (!input.trySkipNullValue()) { - nAGJMPMHMMC = input.readBool(); + hasBeenChallenged = input.readBool(); bitField0_ |= 0x00000008; } } else { @@ -488,13 +492,13 @@ public final class ChallengeBossSingleNodeInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName kLJPBAAGNFN = FieldName.forField("KLJPBAAGNFN"); + static final FieldName buffId = FieldName.forField("buffId", "buff_id"); - static final FieldName dAIMOOEMHJF = FieldName.forField("DAIMOOEMHJF"); + static final FieldName maxScore = FieldName.forField("maxScore", "max_score"); - static final FieldName bMIKMFLHMJD = FieldName.forField("BMIKMFLHMJD"); + static final FieldName isWin = FieldName.forField("isWin", "is_win"); - static final FieldName nAGJMPMHMMC = FieldName.forField("NAGJMPMHMMC"); + static final FieldName hasBeenChallenged = FieldName.forField("hasBeenChallenged", "has_been_challenged"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeDevelopmentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeDevelopmentInfoOuterClass.java index 5bb0c5f..8d608db 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeDevelopmentInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeDevelopmentInfoOuterClass.java @@ -19,7 +19,7 @@ public final class ChallengeDevelopmentInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 1; + * optional uint32 challenge_id = 14; */ private int challengeId; @@ -34,7 +34,7 @@ public final class ChallengeDevelopmentInfoOuterClass { } /** - * optional uint32 challenge_id = 1; + * optional uint32 challenge_id = 14; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -42,7 +42,7 @@ public final class ChallengeDevelopmentInfoOuterClass { } /** - * optional uint32 challenge_id = 1; + * optional uint32 challenge_id = 14; * @return this */ public ChallengeDevelopmentInfo clearChallengeId() { @@ -52,7 +52,7 @@ public final class ChallengeDevelopmentInfoOuterClass { } /** - * optional uint32 challenge_id = 1; + * optional uint32 challenge_id = 14; * @return the challengeId */ public int getChallengeId() { @@ -60,7 +60,7 @@ public final class ChallengeDevelopmentInfoOuterClass { } /** - * optional uint32 challenge_id = 1; + * optional uint32 challenge_id = 14; * @param value the challengeId to set * @return this */ @@ -129,7 +129,7 @@ public final class ChallengeDevelopmentInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(challengeId); } } @@ -150,7 +150,7 @@ public final class ChallengeDevelopmentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 112: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java index f4343a5..5263290 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java @@ -19,7 +19,7 @@ public final class ChallengeExtInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ChallengeBossInfo boss_info = 11; + * optional .ChallengeBossInfo boss_info = 4; */ private final ChallengeBossInfoOuterClass.ChallengeBossInfo bossInfo = ChallengeBossInfoOuterClass.ChallengeBossInfo.newInstance(); @@ -33,8 +33,19 @@ public final class ChallengeExtInfoOuterClass { return new ChallengeExtInfo(); } + public boolean hasChallengeExt() { + return (((bitField0_ & 0x00000001)) != 0); + } + + public ChallengeExtInfo clearChallengeExt() { + if (hasChallengeExt()) { + clearBossInfo(); + } + return this; + } + /** - * optional .ChallengeBossInfo boss_info = 11; + * optional .ChallengeBossInfo boss_info = 4; * @return whether the bossInfo field is set */ public boolean hasBossInfo() { @@ -42,7 +53,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 11; + * optional .ChallengeBossInfo boss_info = 4; * @return this */ public ChallengeExtInfo clearBossInfo() { @@ -52,7 +63,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 11; + * optional .ChallengeBossInfo boss_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 +77,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 11; + * optional .ChallengeBossInfo boss_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 +91,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 11; + * optional .ChallengeBossInfo boss_info = 4; * @param value the bossInfo to set * @return this */ @@ -150,7 +161,7 @@ public final class ChallengeExtInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 34); output.writeMessageNoTag(bossInfo); } } @@ -171,7 +182,7 @@ public final class ChallengeExtInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 34: { // bossInfo input.readMessage(bossInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java index 52bec58..7b4c8b7 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java @@ -19,37 +19,37 @@ public final class ChallengeInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 score = 3; - */ - private int score; - - /** - * optional uint32 challenge_id = 5; + * optional uint32 challenge_id = 4; */ private int challengeId; /** - * optional uint32 score_two = 12; + * optional uint32 score_two = 5; */ private int scoreTwo; /** - * optional uint32 round_count = 14; + * optional uint32 round_count = 13; */ private int roundCount; /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional uint32 score = 14; */ - private int extraLineupType; + private int score; /** - * optional .ChallengeStatus status = 13; + * optional .ChallengeStatus status = 1; */ private int status; /** - * optional .ChallengeStoryInfo ext_info = 9; + * optional .ExtraLineupType extra_lineup_type = 11; + */ + private int extraLineupType; + + /** + * optional .ChallengeStoryInfo ext_info = 7; */ private final ChallengeStoryInfoOuterClass.ChallengeStoryInfo extInfo = ChallengeStoryInfoOuterClass.ChallengeStoryInfo.newInstance(); @@ -64,62 +64,25 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score = 3; - * @return whether the score field is set + * optional uint32 challenge_id = 4; + * @return whether the challengeId field is set */ - public boolean hasScore() { + public boolean hasChallengeId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 score = 3; - * @return this - */ - public ChallengeInfo clearScore() { - bitField0_ &= ~0x00000001; - score = 0; - return this; - } - - /** - * optional uint32 score = 3; - * @return the score - */ - public int getScore() { - return score; - } - - /** - * optional uint32 score = 3; - * @param value the score to set - * @return this - */ - public ChallengeInfo setScore(final int value) { - bitField0_ |= 0x00000001; - score = value; - return this; - } - - /** - * optional uint32 challenge_id = 5; - * @return whether the challengeId field is set - */ - public boolean hasChallengeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 challenge_id = 5; + * optional uint32 challenge_id = 4; * @return this */ public ChallengeInfo clearChallengeId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; challengeId = 0; return this; } /** - * optional uint32 challenge_id = 5; + * optional uint32 challenge_id = 4; * @return the challengeId */ public int getChallengeId() { @@ -127,36 +90,36 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 challenge_id = 5; + * optional uint32 challenge_id = 4; * @param value the challengeId to set * @return this */ public ChallengeInfo setChallengeId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; challengeId = value; return this; } /** - * optional uint32 score_two = 12; + * optional uint32 score_two = 5; * @return whether the scoreTwo field is set */ public boolean hasScoreTwo() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 score_two = 12; + * optional uint32 score_two = 5; * @return this */ public ChallengeInfo clearScoreTwo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; scoreTwo = 0; return this; } /** - * optional uint32 score_two = 12; + * optional uint32 score_two = 5; * @return the scoreTwo */ public int getScoreTwo() { @@ -164,36 +127,36 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 12; + * optional uint32 score_two = 5; * @param value the scoreTwo to set * @return this */ public ChallengeInfo setScoreTwo(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; scoreTwo = value; return this; } /** - * optional uint32 round_count = 14; + * optional uint32 round_count = 13; * @return whether the roundCount field is set */ public boolean hasRoundCount() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 round_count = 14; + * optional uint32 round_count = 13; * @return this */ public ChallengeInfo clearRoundCount() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; roundCount = 0; return this; } /** - * optional uint32 round_count = 14; + * optional uint32 round_count = 13; * @return the roundCount */ public int getRoundCount() { @@ -201,98 +164,73 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 round_count = 14; + * optional uint32 round_count = 13; * @param value the roundCount to set * @return this */ public ChallengeInfo setRoundCount(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; roundCount = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 7; - * @return whether the extraLineupType field is set + * optional uint32 score = 14; + * @return whether the score field is set */ - public boolean hasExtraLineupType() { + public boolean hasScore() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 score = 14; + * @return this + */ + public ChallengeInfo clearScore() { + bitField0_ &= ~0x00000008; + score = 0; + return this; + } + + /** + * optional uint32 score = 14; + * @return the score + */ + public int getScore() { + return score; + } + + /** + * optional uint32 score = 14; + * @param value the score to set + * @return this + */ + public ChallengeInfo setScore(final int value) { + bitField0_ |= 0x00000008; + score = value; + return this; + } + + /** + * optional .ChallengeStatus status = 1; + * @return whether the status field is set + */ + public boolean hasStatus() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .ExtraLineupType extra_lineup_type = 7; - * @return this - */ - public ChallengeInfo clearExtraLineupType() { - bitField0_ &= ~0x00000010; - extraLineupType = 0; - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 7; - * @return the extraLineupType - */ - public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { - return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber(). - * - * @return numeric wire representation - */ - public int getExtraLineupTypeValue() { - return extraLineupType; - } - - /** - * Sets the value of the internal enum store. This does not - * do any validity checks, so be sure to use appropriate value - * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value - * can cause {@link ChallengeInfo#getExtraLineupType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public ChallengeInfo setExtraLineupTypeValue(final int value) { - bitField0_ |= 0x00000010; - extraLineupType = value; - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 7; - * @param value the extraLineupType to set - * @return this - */ - public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) { - bitField0_ |= 0x00000010; - extraLineupType = value.getNumber(); - return this; - } - - /** - * optional .ChallengeStatus status = 13; - * @return whether the status field is set - */ - public boolean hasStatus() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .ChallengeStatus status = 13; + * optional .ChallengeStatus status = 1; * @return this */ public ChallengeInfo clearStatus() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; status = 0; return this; } /** - * optional .ChallengeStatus status = 13; + * optional .ChallengeStatus status = 1; * @return the status */ public ChallengeStatusOuterClass.ChallengeStatus getStatus() { @@ -319,24 +257,86 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo setStatusValue(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; status = value; return this; } /** - * optional .ChallengeStatus status = 13; + * optional .ChallengeStatus status = 1; * @param value the status to set * @return this */ public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; status = value.getNumber(); return this; } /** - * optional .ChallengeStoryInfo ext_info = 9; + * optional .ExtraLineupType extra_lineup_type = 11; + * @return whether the extraLineupType field is set + */ + public boolean hasExtraLineupType() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 11; + * @return this + */ + public ChallengeInfo clearExtraLineupType() { + bitField0_ &= ~0x00000020; + extraLineupType = 0; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 11; + * @return the extraLineupType + */ + public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { + return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getExtraLineupTypeValue() { + return extraLineupType; + } + + /** + * Sets the value of the internal enum store. This does not + * do any validity checks, so be sure to use appropriate value + * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value + * can cause {@link ChallengeInfo#getExtraLineupType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public ChallengeInfo setExtraLineupTypeValue(final int value) { + bitField0_ |= 0x00000020; + extraLineupType = value; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 11; + * @param value the extraLineupType to set + * @return this + */ + public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) { + bitField0_ |= 0x00000020; + extraLineupType = value.getNumber(); + return this; + } + + /** + * optional .ChallengeStoryInfo ext_info = 7; * @return whether the extInfo field is set */ public boolean hasExtInfo() { @@ -344,7 +344,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo ext_info = 9; + * optional .ChallengeStoryInfo ext_info = 7; * @return this */ public ChallengeInfo clearExtInfo() { @@ -354,7 +354,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo ext_info = 9; + * optional .ChallengeStoryInfo 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. @@ -368,7 +368,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo ext_info = 9; + * optional .ChallengeStoryInfo 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 @@ -382,7 +382,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo ext_info = 9; + * optional .ChallengeStoryInfo ext_info = 7; * @param value the extInfo to set * @return this */ @@ -397,12 +397,12 @@ public final class ChallengeInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - score = other.score; challengeId = other.challengeId; scoreTwo = other.scoreTwo; roundCount = other.roundCount; - extraLineupType = other.extraLineupType; + score = other.score; status = other.status; + extraLineupType = other.extraLineupType; extInfo.copyFrom(other.extInfo); } return this; @@ -414,9 +414,6 @@ public final class ChallengeInfoOuterClass { return this; } cachedSize = -1; - if (other.hasScore()) { - setScore(other.score); - } if (other.hasChallengeId()) { setChallengeId(other.challengeId); } @@ -426,12 +423,15 @@ public final class ChallengeInfoOuterClass { if (other.hasRoundCount()) { setRoundCount(other.roundCount); } - if (other.hasExtraLineupType()) { - setExtraLineupTypeValue(other.extraLineupType); + if (other.hasScore()) { + setScore(other.score); } if (other.hasStatus()) { setStatusValue(other.status); } + if (other.hasExtraLineupType()) { + setExtraLineupTypeValue(other.extraLineupType); + } if (other.hasExtInfo()) { getMutableExtInfo().mergeFrom(other.extInfo); } @@ -445,12 +445,12 @@ public final class ChallengeInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - score = 0; challengeId = 0; scoreTwo = 0; roundCount = 0; - extraLineupType = 0; + score = 0; status = 0; + extraLineupType = 0; extInfo.clear(); return this; } @@ -476,43 +476,43 @@ public final class ChallengeInfoOuterClass { } ChallengeInfo other = (ChallengeInfo) o; return bitField0_ == other.bitField0_ - && (!hasScore() || score == other.score) && (!hasChallengeId() || challengeId == other.challengeId) && (!hasScoreTwo() || scoreTwo == other.scoreTwo) && (!hasRoundCount() || roundCount == other.roundCount) - && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) + && (!hasScore() || score == other.score) && (!hasStatus() || status == other.status) + && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasExtInfo() || extInfo.equals(other.extInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(score); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(challengeId); + output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(scoreTwo); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(roundCount); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(roundCount); + output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); - output.writeEnumNoTag(extraLineupType); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 8); output.writeEnumNoTag(status); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 88); + output.writeEnumNoTag(extraLineupType); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 58); output.writeMessageNoTag(extInfo); } } @@ -521,22 +521,22 @@ public final class ChallengeInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); + size += 1 + ProtoSink.computeEnumSizeNoTag(status); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(status); + size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); @@ -551,9 +551,9 @@ public final class ChallengeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // score - score = input.readUInt32(); + case 32: { + // challengeId + challengeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 40) { @@ -561,17 +561,17 @@ public final class ChallengeInfoOuterClass { } } case 40: { - // challengeId - challengeId = input.readUInt32(); + // scoreTwo + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // scoreTwo - scoreTwo = input.readUInt32(); + case 104: { + // roundCount + roundCount = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 112) { @@ -579,39 +579,39 @@ public final class ChallengeInfoOuterClass { } } case 112: { - // roundCount - roundCount = input.readUInt32(); + // score + score = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 56) { + if (tag != 8) { break; } } - case 56: { - // extraLineupType - final int value = input.readInt32(); - if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { - extraLineupType = value; - bitField0_ |= 0x00000010; - } - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 8: { // status final int value = input.readInt32(); if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { status = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 74) { + if (tag != 88) { break; } } - case 74: { + case 88: { + // extraLineupType + final int value = input.readInt32(); + if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { + extraLineupType = value; + bitField0_ |= 0x00000020; + } + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { // extInfo input.readMessage(extInfo); bitField0_ |= 0x00000040; @@ -638,22 +638,22 @@ public final class ChallengeInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.score, score); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.challengeId, challengeId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.scoreTwo, scoreTwo); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.roundCount, roundCount); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.score, score); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); } if ((bitField0_ & 0x00000020) != 0) { - output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); + output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } if ((bitField0_ & 0x00000040) != 0) { output.writeMessage(FieldNames.extInfo, extInfo); @@ -668,23 +668,12 @@ public final class ChallengeInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109264530: { - if (input.isAtField(FieldNames.score)) { - if (!input.trySkipNullValue()) { - score = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -689112866: case 112359031: { if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { challengeId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -696,7 +685,7 @@ public final class ChallengeInfoOuterClass { if (input.isAtField(FieldNames.scoreTwo)) { if (!input.trySkipNullValue()) { scoreTwo = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -708,6 +697,17 @@ public final class ChallengeInfoOuterClass { if (input.isAtField(FieldNames.roundCount)) { if (!input.trySkipNullValue()) { roundCount = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109264530: { + if (input.isAtField(FieldNames.score)) { + if (!input.trySkipNullValue()) { + score = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -715,6 +715,22 @@ public final class ChallengeInfoOuterClass { } break; } + case -892481550: { + if (input.isAtField(FieldNames.status)) { + if (!input.trySkipNullValue()) { + final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); + if (value != null) { + status = value.getNumber(); + bitField0_ |= 0x00000010; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } case -468135527: case -1144475077: { if (input.isAtField(FieldNames.extraLineupType)) { @@ -722,22 +738,6 @@ public final class ChallengeInfoOuterClass { final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); if (value != null) { extraLineupType = value.getNumber(); - bitField0_ |= 0x00000010; - } else { - input.skipUnknownEnumValue(); - } - } - } else { - input.skipUnknownField(); - } - break; - } - case -892481550: { - if (input.isAtField(FieldNames.status)) { - if (!input.trySkipNullValue()) { - final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); - if (value != null) { - status = value.getNumber(); bitField0_ |= 0x00000020; } else { input.skipUnknownEnumValue(); @@ -812,18 +812,18 @@ public final class ChallengeInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName score = FieldName.forField("score"); - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); static final FieldName roundCount = FieldName.forField("roundCount", "round_count"); - static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); + static final FieldName score = FieldName.forField("score"); static final FieldName status = FieldName.forField("status"); + static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); + static final FieldName extInfo = FieldName.forField("extInfo", "ext_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java index c9abd4f..28b113f 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 = 13; + * optional .ExtraLineupType extra_lineup_type = 2; */ private int extraLineupType; @@ -34,7 +34,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 2; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -42,7 +42,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 2; * @return this */ public ChallengeLineupNotify clearExtraLineupType() { @@ -52,7 +52,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 2; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -85,7 +85,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 2; * @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) 104); + output.writeRawByte((byte) 16); output.writeEnumNoTag(extraLineupType); } } @@ -176,7 +176,7 @@ public final class ChallengeLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 16: { // 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 73ce3b5..865fd41 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java @@ -19,27 +19,27 @@ public final class ChallengeOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 score = 1; - */ - private int score; - - /** - * optional uint32 challenge_id = 5; - */ - private int challengeId; - - /** - * optional uint32 taken_reward = 9; - */ - private int takenReward; - - /** - * optional uint32 stars = 14; + * optional uint32 stars = 1; */ private int stars; /** - * optional .ChallengeExtInfo ext_info = 3; + * optional uint32 taken_reward = 6; + */ + private int takenReward; + + /** + * optional uint32 score = 7; + */ + private int score; + + /** + * optional uint32 challenge_id = 10; + */ + private int challengeId; + + /** + * optional .ChallengeExtInfo ext_info = 5; */ private final ChallengeExtInfoOuterClass.ChallengeExtInfo extInfo = ChallengeExtInfoOuterClass.ChallengeExtInfo.newInstance(); @@ -54,136 +54,25 @@ public final class ChallengeOuterClass { } /** - * optional uint32 score = 1; - * @return whether the score field is set + * optional uint32 stars = 1; + * @return whether the stars field is set */ - public boolean hasScore() { + public boolean hasStars() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 score = 1; - * @return this - */ - public Challenge clearScore() { - bitField0_ &= ~0x00000001; - score = 0; - return this; - } - - /** - * optional uint32 score = 1; - * @return the score - */ - public int getScore() { - return score; - } - - /** - * optional uint32 score = 1; - * @param value the score to set - * @return this - */ - public Challenge setScore(final int value) { - bitField0_ |= 0x00000001; - score = value; - return this; - } - - /** - * optional uint32 challenge_id = 5; - * @return whether the challengeId field is set - */ - public boolean hasChallengeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 challenge_id = 5; - * @return this - */ - public Challenge clearChallengeId() { - bitField0_ &= ~0x00000002; - challengeId = 0; - return this; - } - - /** - * optional uint32 challenge_id = 5; - * @return the challengeId - */ - public int getChallengeId() { - return challengeId; - } - - /** - * optional uint32 challenge_id = 5; - * @param value the challengeId to set - * @return this - */ - public Challenge setChallengeId(final int value) { - bitField0_ |= 0x00000002; - challengeId = value; - return this; - } - - /** - * optional uint32 taken_reward = 9; - * @return whether the takenReward field is set - */ - public boolean hasTakenReward() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 taken_reward = 9; - * @return this - */ - public Challenge clearTakenReward() { - bitField0_ &= ~0x00000004; - takenReward = 0; - return this; - } - - /** - * optional uint32 taken_reward = 9; - * @return the takenReward - */ - public int getTakenReward() { - return takenReward; - } - - /** - * optional uint32 taken_reward = 9; - * @param value the takenReward to set - * @return this - */ - public Challenge setTakenReward(final int value) { - bitField0_ |= 0x00000004; - takenReward = value; - return this; - } - - /** - * optional uint32 stars = 14; - * @return whether the stars field is set - */ - public boolean hasStars() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 stars = 14; + * optional uint32 stars = 1; * @return this */ public Challenge clearStars() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; stars = 0; return this; } /** - * optional uint32 stars = 14; + * optional uint32 stars = 1; * @return the stars */ public int getStars() { @@ -191,18 +80,129 @@ public final class ChallengeOuterClass { } /** - * optional uint32 stars = 14; + * optional uint32 stars = 1; * @param value the stars to set * @return this */ public Challenge setStars(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; stars = value; return this; } /** - * optional .ChallengeExtInfo ext_info = 3; + * optional uint32 taken_reward = 6; + * @return whether the takenReward field is set + */ + public boolean hasTakenReward() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 taken_reward = 6; + * @return this + */ + public Challenge clearTakenReward() { + bitField0_ &= ~0x00000002; + takenReward = 0; + return this; + } + + /** + * optional uint32 taken_reward = 6; + * @return the takenReward + */ + public int getTakenReward() { + return takenReward; + } + + /** + * optional uint32 taken_reward = 6; + * @param value the takenReward to set + * @return this + */ + public Challenge setTakenReward(final int value) { + bitField0_ |= 0x00000002; + takenReward = 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 challenge_id = 10; + * @return whether the challengeId field is set + */ + public boolean hasChallengeId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 challenge_id = 10; + * @return this + */ + public Challenge clearChallengeId() { + bitField0_ &= ~0x00000008; + challengeId = 0; + return this; + } + + /** + * optional uint32 challenge_id = 10; + * @return the challengeId + */ + public int getChallengeId() { + return challengeId; + } + + /** + * optional uint32 challenge_id = 10; + * @param value the challengeId to set + * @return this + */ + public Challenge setChallengeId(final int value) { + bitField0_ |= 0x00000008; + challengeId = value; + return this; + } + + /** + * optional .ChallengeExtInfo ext_info = 5; * @return whether the extInfo field is set */ public boolean hasExtInfo() { @@ -210,7 +210,7 @@ public final class ChallengeOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 3; + * optional .ChallengeExtInfo ext_info = 5; * @return this */ public Challenge clearExtInfo() { @@ -220,7 +220,7 @@ public final class ChallengeOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 3; + * optional .ChallengeExtInfo ext_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. @@ -234,7 +234,7 @@ public final class ChallengeOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 3; + * optional .ChallengeExtInfo ext_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 @@ -248,7 +248,7 @@ public final class ChallengeOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 3; + * optional .ChallengeExtInfo ext_info = 5; * @param value the extInfo to set * @return this */ @@ -263,10 +263,10 @@ public final class ChallengeOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + stars = other.stars; + takenReward = other.takenReward; score = other.score; challengeId = other.challengeId; - takenReward = other.takenReward; - stars = other.stars; extInfo.copyFrom(other.extInfo); } return this; @@ -278,18 +278,18 @@ public final class ChallengeOuterClass { return this; } cachedSize = -1; + if (other.hasStars()) { + setStars(other.stars); + } + if (other.hasTakenReward()) { + setTakenReward(other.takenReward); + } if (other.hasScore()) { setScore(other.score); } if (other.hasChallengeId()) { setChallengeId(other.challengeId); } - if (other.hasTakenReward()) { - setTakenReward(other.takenReward); - } - if (other.hasStars()) { - setStars(other.stars); - } if (other.hasExtInfo()) { getMutableExtInfo().mergeFrom(other.extInfo); } @@ -303,10 +303,10 @@ public final class ChallengeOuterClass { } cachedSize = -1; bitField0_ = 0; + stars = 0; + takenReward = 0; score = 0; challengeId = 0; - takenReward = 0; - stars = 0; extInfo.clear(); return this; } @@ -332,10 +332,10 @@ public final class ChallengeOuterClass { } Challenge other = (Challenge) o; return bitField0_ == other.bitField0_ + && (!hasStars() || stars == other.stars) + && (!hasTakenReward() || takenReward == other.takenReward) && (!hasScore() || score == other.score) && (!hasChallengeId() || challengeId == other.challengeId) - && (!hasTakenReward() || takenReward == other.takenReward) - && (!hasStars() || stars == other.stars) && (!hasExtInfo() || extInfo.equals(other.extInfo)); } @@ -343,22 +343,22 @@ public final class ChallengeOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(score); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(challengeId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(takenReward); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); output.writeUInt32NoTag(stars); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(takenReward); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(score); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(challengeId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 42); output.writeMessageNoTag(extInfo); } } @@ -367,16 +367,16 @@ public final class ChallengeOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); @@ -392,42 +392,42 @@ public final class ChallengeOuterClass { while (true) { switch (tag) { case 8: { - // score - score = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // challengeId - challengeId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // takenReward - takenReward = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // stars stars = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 48) { break; } } - case 26: { + case 48: { + // takenReward + takenReward = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // score + score = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // challengeId + challengeId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // extInfo input.readMessage(extInfo); bitField0_ |= 0x00000010; @@ -454,16 +454,16 @@ public final class ChallengeOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.score, score); + output.writeUInt32(FieldNames.stars, stars); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.takenReward, takenReward); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.score, score); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.stars, stars); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.extInfo, extInfo); @@ -478,10 +478,10 @@ public final class ChallengeOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109264530: { - if (input.isAtField(FieldNames.score)) { + case 109757537: { + if (input.isAtField(FieldNames.stars)) { if (!input.trySkipNullValue()) { - score = input.readUInt32(); + stars = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -489,23 +489,22 @@ public final class ChallengeOuterClass { } break; } - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { - if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 1216849622: case -1923526233: { if (input.isAtField(FieldNames.takenReward)) { if (!input.trySkipNullValue()) { takenReward = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109264530: { + if (input.isAtField(FieldNames.score)) { + if (!input.trySkipNullValue()) { + score = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -513,10 +512,11 @@ public final class ChallengeOuterClass { } break; } - case 109757537: { - if (input.isAtField(FieldNames.stars)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - stars = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -588,13 +588,13 @@ public final class ChallengeOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName score = FieldName.forField("score"); - - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName stars = FieldName.forField("stars"); static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward"); - static final FieldName stars = FieldName.forField("stars"); + static final FieldName score = FieldName.forField("score"); + + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); static final FieldName 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 3b127ee..648df18 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 = 5; + * optional uint64 taken_challenge_reward = 3; */ private long takenChallengeReward; /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; */ private int groupId; @@ -39,7 +39,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 5; + * optional uint64 taken_challenge_reward = 3; * @return whether the takenChallengeReward field is set */ public boolean hasTakenChallengeReward() { @@ -47,7 +47,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 5; + * optional uint64 taken_challenge_reward = 3; * @return this */ public ChallengeReward clearTakenChallengeReward() { @@ -57,7 +57,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 5; + * optional uint64 taken_challenge_reward = 3; * @return the takenChallengeReward */ public long getTakenChallengeReward() { @@ -65,7 +65,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 5; + * optional uint64 taken_challenge_reward = 3; * @param value the takenChallengeReward to set * @return this */ @@ -76,7 +76,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -84,7 +84,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; * @return this */ public ChallengeReward clearGroupId() { @@ -94,7 +94,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; * @return the groupId */ public int getGroupId() { @@ -102,7 +102,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; * @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) 40); + output.writeRawByte((byte) 24); output.writeUInt64NoTag(takenChallengeReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(groupId); } } @@ -205,16 +205,16 @@ public final class ChallengeRewardOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // takenChallengeReward takenChallengeReward = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 8) { break; } } - case 48: { + case 8: { // 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 6b6002c..4ef1dbd 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java @@ -19,32 +19,32 @@ public final class ChallengeSettleNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 score_two = 1; - */ - private int scoreTwo; - - /** - * optional uint32 stars = 8; - */ - private int stars; - - /** - * optional uint32 challenge_score = 10; + * optional uint32 challenge_score = 1; */ private int challengeScore; /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 5; */ private int challengeId; /** - * optional bool is_win = 5; + * optional uint32 score_two = 12; + */ + private int scoreTwo; + + /** + * optional uint32 stars = 14; + */ + private int stars; + + /** + * optional bool is_win = 4; */ private boolean isWin; /** - * optional .ItemList reward = 9; + * optional .ItemList reward = 10; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -59,99 +59,25 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 score_two = 1; - * @return whether the scoreTwo field is set + * optional uint32 challenge_score = 1; + * @return whether the challengeScore field is set */ - public boolean hasScoreTwo() { + public boolean hasChallengeScore() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 score_two = 1; - * @return this - */ - public ChallengeSettleNotify clearScoreTwo() { - bitField0_ &= ~0x00000001; - scoreTwo = 0; - return this; - } - - /** - * optional uint32 score_two = 1; - * @return the scoreTwo - */ - public int getScoreTwo() { - return scoreTwo; - } - - /** - * optional uint32 score_two = 1; - * @param value the scoreTwo to set - * @return this - */ - public ChallengeSettleNotify setScoreTwo(final int value) { - bitField0_ |= 0x00000001; - scoreTwo = value; - return this; - } - - /** - * optional uint32 stars = 8; - * @return whether the stars field is set - */ - public boolean hasStars() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 stars = 8; - * @return this - */ - public ChallengeSettleNotify clearStars() { - bitField0_ &= ~0x00000002; - stars = 0; - return this; - } - - /** - * optional uint32 stars = 8; - * @return the stars - */ - public int getStars() { - return stars; - } - - /** - * optional uint32 stars = 8; - * @param value the stars to set - * @return this - */ - public ChallengeSettleNotify setStars(final int value) { - bitField0_ |= 0x00000002; - stars = value; - return this; - } - - /** - * optional uint32 challenge_score = 10; - * @return whether the challengeScore field is set - */ - public boolean hasChallengeScore() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 challenge_score = 10; + * optional uint32 challenge_score = 1; * @return this */ public ChallengeSettleNotify clearChallengeScore() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; challengeScore = 0; return this; } /** - * optional uint32 challenge_score = 10; + * optional uint32 challenge_score = 1; * @return the challengeScore */ public int getChallengeScore() { @@ -159,36 +85,36 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_score = 10; + * optional uint32 challenge_score = 1; * @param value the challengeScore to set * @return this */ public ChallengeSettleNotify setChallengeScore(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; challengeScore = value; return this; } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 5; * @return whether the challengeId field is set */ public boolean hasChallengeId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 5; * @return this */ public ChallengeSettleNotify clearChallengeId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; challengeId = 0; return this; } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 5; * @return the challengeId */ public int getChallengeId() { @@ -196,18 +122,92 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 5; * @param value the challengeId to set * @return this */ public ChallengeSettleNotify setChallengeId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; challengeId = value; return this; } /** - * optional bool is_win = 5; + * optional uint32 score_two = 12; + * @return whether the scoreTwo field is set + */ + public boolean hasScoreTwo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 score_two = 12; + * @return this + */ + public ChallengeSettleNotify clearScoreTwo() { + bitField0_ &= ~0x00000004; + scoreTwo = 0; + return this; + } + + /** + * optional uint32 score_two = 12; + * @return the scoreTwo + */ + public int getScoreTwo() { + return scoreTwo; + } + + /** + * optional uint32 score_two = 12; + * @param value the scoreTwo to set + * @return this + */ + public ChallengeSettleNotify setScoreTwo(final int value) { + bitField0_ |= 0x00000004; + scoreTwo = value; + return this; + } + + /** + * optional uint32 stars = 14; + * @return whether the stars field is set + */ + public boolean hasStars() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 stars = 14; + * @return this + */ + public ChallengeSettleNotify clearStars() { + bitField0_ &= ~0x00000008; + stars = 0; + return this; + } + + /** + * optional uint32 stars = 14; + * @return the stars + */ + public int getStars() { + return stars; + } + + /** + * optional uint32 stars = 14; + * @param value the stars to set + * @return this + */ + public ChallengeSettleNotify setStars(final int value) { + bitField0_ |= 0x00000008; + stars = value; + return this; + } + + /** + * optional bool is_win = 4; * @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 = 4; * @return this */ public ChallengeSettleNotify clearIsWin() { @@ -225,7 +225,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 5; + * optional bool is_win = 4; * @return the isWin */ public boolean getIsWin() { @@ -233,7 +233,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 5; + * optional bool is_win = 4; * @param value the isWin to set * @return this */ @@ -244,7 +244,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 9; + * optional .ItemList reward = 10; * @return whether the reward field is set */ public boolean hasReward() { @@ -252,7 +252,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 9; + * optional .ItemList reward = 10; * @return this */ public ChallengeSettleNotify clearReward() { @@ -262,7 +262,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 9; + * optional .ItemList reward = 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. @@ -276,7 +276,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 9; + * optional .ItemList reward = 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 @@ -290,7 +290,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 9; + * optional .ItemList reward = 10; * @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_; - scoreTwo = other.scoreTwo; - stars = other.stars; challengeScore = other.challengeScore; challengeId = other.challengeId; + scoreTwo = other.scoreTwo; + stars = other.stars; isWin = other.isWin; reward.copyFrom(other.reward); } @@ -321,18 +321,18 @@ public final class ChallengeSettleNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasScoreTwo()) { - setScoreTwo(other.scoreTwo); - } - if (other.hasStars()) { - setStars(other.stars); - } if (other.hasChallengeScore()) { setChallengeScore(other.challengeScore); } if (other.hasChallengeId()) { setChallengeId(other.challengeId); } + if (other.hasScoreTwo()) { + setScoreTwo(other.scoreTwo); + } + if (other.hasStars()) { + setStars(other.stars); + } if (other.hasIsWin()) { setIsWin(other.isWin); } @@ -349,10 +349,10 @@ public final class ChallengeSettleNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - scoreTwo = 0; - stars = 0; challengeScore = 0; challengeId = 0; + scoreTwo = 0; + stars = 0; isWin = false; reward.clear(); return this; @@ -379,10 +379,10 @@ public final class ChallengeSettleNotifyOuterClass { } ChallengeSettleNotify other = (ChallengeSettleNotify) o; return bitField0_ == other.bitField0_ - && (!hasScoreTwo() || scoreTwo == other.scoreTwo) - && (!hasStars() || stars == other.stars) && (!hasChallengeScore() || challengeScore == other.challengeScore) && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasScoreTwo() || scoreTwo == other.scoreTwo) + && (!hasStars() || stars == other.stars) && (!hasIsWin() || isWin == other.isWin) && (!hasReward() || reward.equals(other.reward)); } @@ -391,26 +391,26 @@ public final class ChallengeSettleNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(scoreTwo); + output.writeUInt32NoTag(challengeScore); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(stars); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(challengeScore); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(challengeId); + output.writeUInt32NoTag(stars); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 82); output.writeMessageNoTag(reward); } } @@ -419,17 +419,17 @@ public final class ChallengeSettleNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + } if ((bitField0_ & 0x00000010) != 0) { size += 2; } @@ -447,26 +447,26 @@ public final class ChallengeSettleNotifyOuterClass { while (true) { switch (tag) { case 8: { - // scoreTwo - scoreTwo = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // stars - stars = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { // challengeScore challengeScore = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // challengeId + challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // scoreTwo + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 112) { @@ -474,24 +474,24 @@ public final class ChallengeSettleNotifyOuterClass { } } case 112: { - // challengeId - challengeId = input.readUInt32(); + // stars + stars = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 40) { + if (tag != 32) { break; } } - case 40: { + case 32: { // isWin isWin = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 74) { + if (tag != 82) { break; } } - case 74: { + case 82: { // reward input.readMessage(reward); bitField0_ |= 0x00000020; @@ -518,17 +518,17 @@ public final class ChallengeSettleNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.scoreTwo, scoreTwo); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stars, stars); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.challengeScore, challengeScore); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.challengeId, challengeId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.scoreTwo, scoreTwo); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.stars, stars); + } if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.isWin, isWin); } @@ -545,35 +545,12 @@ public final class ChallengeSettleNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -485512614: - case 2129303327: { - if (input.isAtField(FieldNames.scoreTwo)) { - if (!input.trySkipNullValue()) { - scoreTwo = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 109757537: { - if (input.isAtField(FieldNames.stars)) { - if (!input.trySkipNullValue()) { - stars = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 591599599: case 1517684662: { if (input.isAtField(FieldNames.challengeScore)) { if (!input.trySkipNullValue()) { challengeScore = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -585,6 +562,29 @@ public final class ChallengeSettleNotifyOuterClass { if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -485512614: + case 2129303327: { + if (input.isAtField(FieldNames.scoreTwo)) { + if (!input.trySkipNullValue()) { + scoreTwo = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109757537: { + if (input.isAtField(FieldNames.stars)) { + if (!input.trySkipNullValue()) { + stars = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -668,14 +668,14 @@ public final class ChallengeSettleNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); - - static final FieldName stars = FieldName.forField("stars"); - static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score"); static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); + + static final FieldName stars = FieldName.forField("stars"); + static final FieldName isWin = FieldName.forField("isWin", "is_win"); static final FieldName reward = FieldName.forField("reward"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStatusOuterClass.java index a5300d4..1b5b58a 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeStatusOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeStatusOuterClass.java @@ -77,7 +77,7 @@ public final class ChallengeStatusOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return ChallengeStatusConverter.INSTANCE; } @@ -99,7 +99,7 @@ public final class ChallengeStatusOuterClass { return value == null ? other : value; } - enum ChallengeStatusConverter implements EnumConverter { + enum ChallengeStatusConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final ChallengeStatus[] lookup = new ChallengeStatus[4]; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java index 032e221..50a25e8 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 = 3; + * repeated uint32 buff_list = 1; */ private final RepeatedInt buffList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 3; + * repeated uint32 buff_list = 1; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -43,7 +43,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 3; + * repeated uint32 buff_list = 1; * @return this */ public ChallengeStoryBuffInfo clearBuffList() { @@ -53,7 +53,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 3; + * repeated uint32 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 ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 3; + * repeated uint32 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 ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 3; + * repeated uint32 buff_list = 1; * @param value the buffList to add * @return this */ @@ -92,7 +92,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 3; + * repeated uint32 buff_list = 1; * @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) 24); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(buffList.array()[i]); } } @@ -185,7 +185,7 @@ public final class ChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 10: { // buffList [packed=true] input.readPackedUInt32(buffList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class ChallengeStoryBuffInfoOuterClass { tag = input.readTag(); break; } - case 24: { + case 8: { // buffList [packed=false] tag = input.readRepeatedUInt32(buffList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java index 723b166..a6e5487 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 = 9; + * optional uint32 slot = 8; */ private int slot; @@ -34,7 +34,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 8; * @return whether the slot field is set */ public boolean hasSlot() { @@ -42,7 +42,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 8; * @return this */ public ChangeLineupLeaderCsReq clearSlot() { @@ -52,7 +52,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 8; * @return the slot */ public int getSlot() { @@ -60,7 +60,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 8; * @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) 72); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(slot); } } @@ -150,7 +150,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 64: { // 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 3f1de94..c32aaaa 100644 --- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java @@ -19,12 +19,12 @@ public final class ChangeLineupLeaderScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 5; + * optional uint32 slot = 8; */ private int slot; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; */ private int retcode; @@ -39,7 +39,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 5; + * optional uint32 slot = 8; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 5; + * optional uint32 slot = 8; * @return this */ public ChangeLineupLeaderScRsp clearSlot() { @@ -57,7 +57,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 5; + * optional uint32 slot = 8; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 5; + * optional uint32 slot = 8; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; * @return this */ public ChangeLineupLeaderScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class ChangeLineupLeaderScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class ChangeLineupLeaderScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 64: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java index bdf1e4c..a9cf44c 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 unk_int = 7; - */ - private int unkInt; - - /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 4; */ private int groupId; + /** + * optional uint32 unk_int = 9; + */ + private int unkInt; + private ChargerInfo() { } @@ -39,62 +39,25 @@ public final class ChargerInfoOuterClass { } /** - * optional uint32 unk_int = 7; - * @return whether the unkInt field is set + * optional uint32 group_id = 4; + * @return whether the groupId field is set */ - public boolean hasUnkInt() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unk_int = 7; - * @return this - */ - public ChargerInfo clearUnkInt() { - bitField0_ &= ~0x00000001; - unkInt = 0; - return this; - } - - /** - * optional uint32 unk_int = 7; - * @return the unkInt - */ - public int getUnkInt() { - return unkInt; - } - - /** - * optional uint32 unk_int = 7; - * @param value the unkInt to set - * @return this - */ - public ChargerInfo setUnkInt(final int value) { - 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; + * optional uint32 group_id = 4; * @return this */ public ChargerInfo clearGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 4; * @return the groupId */ public int getGroupId() { @@ -102,23 +65,60 @@ public final class ChargerInfoOuterClass { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 4; * @param value the groupId to set * @return this */ public ChargerInfo setGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; groupId = value; return this; } + /** + * optional uint32 unk_int = 9; + * @return whether the unkInt field is set + */ + public boolean hasUnkInt() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 unk_int = 9; + * @return this + */ + public ChargerInfo clearUnkInt() { + bitField0_ &= ~0x00000002; + unkInt = 0; + return this; + } + + /** + * optional uint32 unk_int = 9; + * @return the unkInt + */ + public int getUnkInt() { + return unkInt; + } + + /** + * optional uint32 unk_int = 9; + * @param value the unkInt to set + * @return this + */ + public ChargerInfo setUnkInt(final int value) { + bitField0_ |= 0x00000002; + unkInt = value; + return this; + } + @Override public ChargerInfo copyFrom(final ChargerInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - unkInt = other.unkInt; groupId = other.groupId; + unkInt = other.unkInt; } return this; } @@ -129,12 +129,12 @@ public final class ChargerInfoOuterClass { return this; } cachedSize = -1; - if (other.hasUnkInt()) { - setUnkInt(other.unkInt); - } if (other.hasGroupId()) { setGroupId(other.groupId); } + if (other.hasUnkInt()) { + setUnkInt(other.unkInt); + } return this; } @@ -145,8 +145,8 @@ public final class ChargerInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - unkInt = 0; groupId = 0; + unkInt = 0; return this; } @@ -170,19 +170,19 @@ public final class ChargerInfoOuterClass { } ChargerInfo other = (ChargerInfo) o; return bitField0_ == other.bitField0_ - && (!hasUnkInt() || unkInt == other.unkInt) - && (!hasGroupId() || groupId == other.groupId); + && (!hasGroupId() || groupId == other.groupId) + && (!hasUnkInt() || unkInt == other.unkInt); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(unkInt); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(unkInt); } } @@ -190,10 +190,10 @@ public final class ChargerInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); } return size; } @@ -205,18 +205,18 @@ public final class ChargerInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // unkInt - unkInt = input.readUInt32(); + case 32: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 72) { break; } } - case 120: { - // groupId - groupId = input.readUInt32(); + case 72: { + // unkInt + unkInt = 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.unkInt, unkInt); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.unkInt, unkInt); } output.endObject(); } @@ -256,11 +256,11 @@ public final class ChargerInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class ChargerInfoOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class ChargerInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName unkInt = FieldName.forField("unkInt", "unk_int"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); + + static final FieldName unkInt = FieldName.forField("unkInt", "unk_int"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java index ee4a86f..dcfb439 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 = 13; + * optional uint64 sent_time = 12; */ private long sentTime; /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 2; */ private int senderUid; /** - * optional uint32 emote = 11; + * optional uint32 emote = 3; */ private int emote; /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 10; */ private int msgType; /** - * optional string text = 10; + * optional string text = 11; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 12; * @return whether the sentTime field is set */ public boolean hasSentTime() { @@ -63,7 +63,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 12; * @return this */ public Chat clearSentTime() { @@ -73,7 +73,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 12; * @return the sentTime */ public long getSentTime() { @@ -81,7 +81,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 13; + * optional uint64 sent_time = 12; * @param value the sentTime to set * @return this */ @@ -92,7 +92,7 @@ public final class ChatOuterClass { } /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 2; * @return whether the senderUid field is set */ public boolean hasSenderUid() { @@ -100,7 +100,7 @@ public final class ChatOuterClass { } /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 2; * @return this */ public Chat clearSenderUid() { @@ -110,7 +110,7 @@ public final class ChatOuterClass { } /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 2; * @return the senderUid */ public int getSenderUid() { @@ -118,7 +118,7 @@ public final class ChatOuterClass { } /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 2; * @param value the senderUid to set * @return this */ @@ -129,7 +129,7 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 3; * @return whether the emote field is set */ public boolean hasEmote() { @@ -137,7 +137,7 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 3; * @return this */ public Chat clearEmote() { @@ -147,7 +147,7 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 3; * @return the emote */ public int getEmote() { @@ -155,7 +155,7 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 3; * @param value the emote to set * @return this */ @@ -166,7 +166,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 15; + * 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 = 15; + * optional .MsgType msg_type = 10; * @return this */ public Chat clearMsgType() { @@ -184,7 +184,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 10; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -217,7 +217,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 10; * @param value the msgType to set * @return this */ @@ -228,7 +228,7 @@ public final class ChatOuterClass { } /** - * optional string text = 10; + * optional string text = 11; * @return whether the text field is set */ public boolean hasText() { @@ -236,7 +236,7 @@ public final class ChatOuterClass { } /** - * optional string text = 10; + * optional string text = 11; * @return this */ public Chat clearText() { @@ -246,7 +246,7 @@ public final class ChatOuterClass { } /** - * optional string text = 10; + * optional string text = 11; * @return the text */ public String getText() { @@ -254,7 +254,7 @@ public final class ChatOuterClass { } /** - * optional string text = 10; + * optional string text = 11; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -262,7 +262,7 @@ public final class ChatOuterClass { } /** - * optional string text = 10; + * optional string text = 11; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -271,7 +271,7 @@ public final class ChatOuterClass { } /** - * optional string text = 10; + * optional string text = 11; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public final class ChatOuterClass { } /** - * optional string text = 10; + * optional string text = 11; * @param value the text to set * @return this */ @@ -376,23 +376,23 @@ public final class ChatOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeUInt64NoTag(sentTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeStringNoTag(text); } } @@ -425,34 +425,34 @@ public final class ChatOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 96: { // sentTime sentTime = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 16) { break; } } - case 40: { + case 16: { // senderUid senderUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 24) { break; } } - case 88: { + case 24: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { + 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 != 82) { + if (tag != 90) { break; } } - case 82: { + case 90: { // text input.readString(text); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/ChatTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChatTypeOuterClass.java index 3a5b6dc..8a50a9d 100644 --- a/src/generated/main/emu/lunarcore/proto/ChatTypeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChatTypeOuterClass.java @@ -67,7 +67,7 @@ public final class ChatTypeOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return ChatTypeConverter.INSTANCE; } @@ -89,7 +89,7 @@ public final class ChatTypeOuterClass { return value == null ? other : value; } - enum ChatTypeConverter implements EnumConverter { + enum ChatTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final ChatType[] lookup = new ChatType[3]; diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellCsReqOuterClass.java index d4d32d8..372a6b9 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 = 2; + * optional uint32 cell_id = 15; */ private int cellId; @@ -34,7 +34,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { } /** - * optional uint32 cell_id = 2; + * optional uint32 cell_id = 15; * @return whether the cellId field is set */ public boolean hasCellId() { @@ -42,7 +42,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { } /** - * optional uint32 cell_id = 2; + * optional uint32 cell_id = 15; * @return this */ public ChessRogueSelectCellCsReq clearCellId() { @@ -52,7 +52,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { } /** - * optional uint32 cell_id = 2; + * optional uint32 cell_id = 15; * @return the cellId */ public int getCellId() { @@ -60,7 +60,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { } /** - * optional uint32 cell_id = 2; + * optional uint32 cell_id = 15; * @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) 16); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(cellId); } } @@ -150,7 +150,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 120: { // 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 e4aedc8..025fa40 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java @@ -19,15 +19,15 @@ public final class ChessRogueSelectCellScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cell_id = 8; - */ - private int cellId; - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; */ private int retcode; + /** + * optional uint32 cell_id = 7; + */ + private int cellId; + private ChessRogueSelectCellScRsp() { } @@ -39,62 +39,25 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 cell_id = 8; - * @return whether the cellId field is set + * optional uint32 retcode = 5; + * @return whether the retcode field is set */ - public boolean hasCellId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cell_id = 8; - * @return this - */ - public ChessRogueSelectCellScRsp clearCellId() { - bitField0_ &= ~0x00000001; - cellId = 0; - return this; - } - - /** - * optional uint32 cell_id = 8; - * @return the cellId - */ - public int getCellId() { - return cellId; - } - - /** - * optional uint32 cell_id = 8; - * @param value the cellId to set - * @return this - */ - public ChessRogueSelectCellScRsp setCellId(final int value) { - bitField0_ |= 0x00000001; - cellId = value; - return this; - } - - /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return this */ public ChessRogueSelectCellScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ public ChessRogueSelectCellScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 cell_id = 7; + * @return whether the cellId field is set + */ + public boolean hasCellId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 cell_id = 7; + * @return this + */ + public ChessRogueSelectCellScRsp clearCellId() { + bitField0_ &= ~0x00000002; + cellId = 0; + return this; + } + + /** + * optional uint32 cell_id = 7; + * @return the cellId + */ + public int getCellId() { + return cellId; + } + + /** + * optional uint32 cell_id = 7; + * @param value the cellId to set + * @return this + */ + public ChessRogueSelectCellScRsp setCellId(final int value) { + bitField0_ |= 0x00000002; + cellId = value; + return this; + } + @Override public ChessRogueSelectCellScRsp copyFrom(final ChessRogueSelectCellScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - cellId = other.cellId; retcode = other.retcode; + cellId = other.cellId; } return this; } @@ -129,12 +129,12 @@ public final class ChessRogueSelectCellScRspOuterClass { return this; } cachedSize = -1; - if (other.hasCellId()) { - setCellId(other.cellId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCellId()) { + setCellId(other.cellId); + } return this; } @@ -145,8 +145,8 @@ public final class ChessRogueSelectCellScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - cellId = 0; retcode = 0; + cellId = 0; return this; } @@ -170,19 +170,19 @@ public final class ChessRogueSelectCellScRspOuterClass { } ChessRogueSelectCellScRsp other = (ChessRogueSelectCellScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCellId() || cellId == other.cellId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasCellId() || cellId == other.cellId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(cellId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(cellId); } } @@ -190,10 +190,10 @@ public final class ChessRogueSelectCellScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cellId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cellId); } return size; } @@ -205,18 +205,18 @@ public final class ChessRogueSelectCellScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // cellId - cellId = input.readUInt32(); + case 40: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { - // retcode - retcode = input.readUInt32(); + case 56: { + // cellId + cellId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ChessRogueSelectCellScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.cellId, cellId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.cellId, cellId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class ChessRogueSelectCellScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1364082147: - case 663147800: { - if (input.isAtField(FieldNames.cellId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - cellId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class ChessRogueSelectCellScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1364082147: + case 663147800: { + if (input.isAtField(FieldNames.cellId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + cellId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class ChessRogueSelectCellScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName cellId = FieldName.forField("cellId", "cell_id"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName cellId = FieldName.forField("cellId", "cell_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java index 24561d9..795d5eb 100644 --- a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java @@ -21,52 +21,52 @@ public final class ClientMailOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 expire_time = 1; + * optional int64 expire_time = 3; */ private long expireTime; /** - * optional int64 time = 6; + * optional int64 time = 15; */ private long time; /** - * optional uint32 template_id = 5; + * optional uint32 template_id = 8; */ private int templateId; /** - * optional uint32 id = 7; + * optional uint32 id = 12; */ private int id; /** - * optional bool is_read = 4; + * optional bool is_read = 13; */ private boolean isRead; /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 14; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * optional string title = 8; + * optional string title = 1; */ private final Utf8String title = Utf8String.newEmptyInstance(); /** - * optional string sender = 9; + * optional string sender = 7; */ private final Utf8String sender = Utf8String.newEmptyInstance(); /** - * optional string content = 10; + * optional string content = 11; */ private final Utf8String content = Utf8String.newEmptyInstance(); /** - * repeated string para_list = 3; + * repeated string para_list = 9; */ private final RepeatedString paraList = RepeatedString.newEmptyInstance(); @@ -81,7 +81,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 1; + * optional int64 expire_time = 3; * @return whether the expireTime field is set */ public boolean hasExpireTime() { @@ -89,7 +89,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 1; + * optional int64 expire_time = 3; * @return this */ public ClientMail clearExpireTime() { @@ -99,7 +99,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 1; + * optional int64 expire_time = 3; * @return the expireTime */ public long getExpireTime() { @@ -107,7 +107,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 1; + * optional int64 expire_time = 3; * @param value the expireTime to set * @return this */ @@ -118,7 +118,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 6; + * optional int64 time = 15; * @return whether the time field is set */ public boolean hasTime() { @@ -126,7 +126,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 6; + * optional int64 time = 15; * @return this */ public ClientMail clearTime() { @@ -136,7 +136,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 6; + * optional int64 time = 15; * @return the time */ public long getTime() { @@ -144,7 +144,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 6; + * optional int64 time = 15; * @param value the time to set * @return this */ @@ -155,7 +155,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 5; + * optional uint32 template_id = 8; * @return whether the templateId field is set */ public boolean hasTemplateId() { @@ -163,7 +163,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 5; + * optional uint32 template_id = 8; * @return this */ public ClientMail clearTemplateId() { @@ -173,7 +173,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 5; + * optional uint32 template_id = 8; * @return the templateId */ public int getTemplateId() { @@ -181,7 +181,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 5; + * optional uint32 template_id = 8; * @param value the templateId to set * @return this */ @@ -192,7 +192,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 id = 7; + * optional uint32 id = 12; * @return whether the id field is set */ public boolean hasId() { @@ -200,7 +200,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 id = 7; + * optional uint32 id = 12; * @return this */ public ClientMail clearId() { @@ -210,7 +210,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 id = 7; + * optional uint32 id = 12; * @return the id */ public int getId() { @@ -218,7 +218,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 id = 7; + * optional uint32 id = 12; * @param value the id to set * @return this */ @@ -229,7 +229,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 4; + * optional bool is_read = 13; * @return whether the isRead field is set */ public boolean hasIsRead() { @@ -237,7 +237,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 4; + * optional bool is_read = 13; * @return this */ public ClientMail clearIsRead() { @@ -247,7 +247,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 4; + * optional bool is_read = 13; * @return the isRead */ public boolean getIsRead() { @@ -255,7 +255,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 4; + * optional bool is_read = 13; * @param value the isRead to set * @return this */ @@ -266,7 +266,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 14; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -274,7 +274,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 14; * @return this */ public ClientMail clearAttachment() { @@ -284,7 +284,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 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. @@ -298,7 +298,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 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 @@ -312,7 +312,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 14; * @param value the attachment to set * @return this */ @@ -323,7 +323,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 8; + * optional string title = 1; * @return whether the title field is set */ public boolean hasTitle() { @@ -331,7 +331,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 8; + * optional string title = 1; * @return this */ public ClientMail clearTitle() { @@ -341,7 +341,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 8; + * optional string title = 1; * @return the title */ public String getTitle() { @@ -349,7 +349,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 8; + * optional string title = 1; * @return internal {@code Utf8String} representation of title for reading */ public Utf8String getTitleBytes() { @@ -357,7 +357,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 8; + * optional string title = 1; * @return internal {@code Utf8String} representation of title for modifications */ public Utf8String getMutableTitleBytes() { @@ -366,7 +366,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 8; + * optional string title = 1; * @param value the title to set * @return this */ @@ -377,7 +377,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 8; + * optional string title = 1; * @param value the title to set * @return this */ @@ -388,7 +388,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 9; + * optional string sender = 7; * @return whether the sender field is set */ public boolean hasSender() { @@ -396,7 +396,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 9; + * optional string sender = 7; * @return this */ public ClientMail clearSender() { @@ -406,7 +406,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 9; + * optional string sender = 7; * @return the sender */ public String getSender() { @@ -414,7 +414,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 9; + * optional string sender = 7; * @return internal {@code Utf8String} representation of sender for reading */ public Utf8String getSenderBytes() { @@ -422,7 +422,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 9; + * optional string sender = 7; * @return internal {@code Utf8String} representation of sender for modifications */ public Utf8String getMutableSenderBytes() { @@ -431,7 +431,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 9; + * optional string sender = 7; * @param value the sender to set * @return this */ @@ -442,7 +442,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 9; + * optional string sender = 7; * @param value the sender to set * @return this */ @@ -453,7 +453,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 10; + * optional string content = 11; * @return whether the content field is set */ public boolean hasContent() { @@ -461,7 +461,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 10; + * optional string content = 11; * @return this */ public ClientMail clearContent() { @@ -471,7 +471,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 10; + * optional string content = 11; * @return the content */ public String getContent() { @@ -479,7 +479,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 10; + * optional string content = 11; * @return internal {@code Utf8String} representation of content for reading */ public Utf8String getContentBytes() { @@ -487,7 +487,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 10; + * optional string content = 11; * @return internal {@code Utf8String} representation of content for modifications */ public Utf8String getMutableContentBytes() { @@ -496,7 +496,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 10; + * optional string content = 11; * @param value the content to set * @return this */ @@ -507,7 +507,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 10; + * optional string content = 11; * @param value the content to set * @return this */ @@ -518,7 +518,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 3; + * 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 = 3; + * repeated string para_list = 9; * @return this */ public ClientMail clearParaList() { @@ -536,7 +536,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 3; + * 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 = 3; + * 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 = 3; + * 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 = 3; + * repeated string para_list = 9; * @param values the paraList to add * @return this */ @@ -703,44 +703,44 @@ public final class ClientMailOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeInt64NoTag(expireTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 120); output.writeInt64NoTag(time); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(templateId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 104); output.writeBoolNoTag(isRead); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 114); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 10); output.writeStringNoTag(title); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 58); output.writeStringNoTag(sender); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeStringNoTag(content); } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < paraList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 74); output.writeStringNoTag(paraList.get(i)); } } @@ -789,88 +789,88 @@ public final class ClientMailOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 24: { // expireTime expireTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 120) { break; } } - case 48: { + case 120: { // time time = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { + case 64: { // templateId templateId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { + case 96: { // id id = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 32) { + if (tag != 104) { break; } } - case 32: { + case 104: { // isRead isRead = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { + case 114: { // attachment input.readMessage(attachment); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 66) { + if (tag != 10) { break; } } - case 66: { + case 10: { // title input.readString(title); bitField0_ |= 0x00000040; tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // sender + input.readString(sender); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { + // content + input.readString(content); + bitField0_ |= 0x00000100; + tag = input.readTag(); if (tag != 74) { break; } } case 74: { - // sender - input.readString(sender); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // content - input.readString(content); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { // paraList tag = input.readRepeatedString(paraList, tag); bitField0_ |= 0x00000200; diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java index 39a4c8c..a1a3139 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 count = 4; - */ - private int count; - - /** - * optional uint32 compose_id = 9; + * optional uint32 compose_id = 5; */ private int composeId; /** - * optional .ItemCostList compose_item_list = 8; + * optional uint32 count = 6; + */ + private int count; + + /** + * optional .ItemCostList compose_item_list = 3; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -44,62 +44,25 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 count = 4; - * @return whether the count field is set + * optional uint32 compose_id = 5; + * @return whether the composeId field is set */ - public boolean hasCount() { + public boolean hasComposeId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 count = 4; - * @return this - */ - public ComposeItemCsReq clearCount() { - bitField0_ &= ~0x00000001; - count = 0; - return this; - } - - /** - * optional uint32 count = 4; - * @return the count - */ - public int getCount() { - return count; - } - - /** - * optional uint32 count = 4; - * @param value the count to set - * @return this - */ - public ComposeItemCsReq setCount(final int value) { - bitField0_ |= 0x00000001; - count = value; - return this; - } - - /** - * optional uint32 compose_id = 9; - * @return whether the composeId field is set - */ - public boolean hasComposeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 compose_id = 9; + * optional uint32 compose_id = 5; * @return this */ public ComposeItemCsReq clearComposeId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; composeId = 0; return this; } /** - * optional uint32 compose_id = 9; + * optional uint32 compose_id = 5; * @return the composeId */ public int getComposeId() { @@ -107,18 +70,55 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 compose_id = 9; + * optional uint32 compose_id = 5; * @param value the composeId to set * @return this */ public ComposeItemCsReq setComposeId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; composeId = value; return this; } /** - * optional .ItemCostList compose_item_list = 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 ComposeItemCsReq 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 ComposeItemCsReq setCount(final int value) { + bitField0_ |= 0x00000002; + count = value; + return this; + } + + /** + * optional .ItemCostList compose_item_list = 3; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -126,7 +126,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 8; + * optional .ItemCostList compose_item_list = 3; * @return this */ public ComposeItemCsReq clearComposeItemList() { @@ -136,7 +136,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 8; + * optional .ItemCostList compose_item_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. @@ -150,7 +150,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 8; + * optional .ItemCostList compose_item_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 @@ -164,7 +164,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 8; + * optional .ItemCostList compose_item_list = 3; * @param value the composeItemList to set * @return this */ @@ -179,8 +179,8 @@ public final class ComposeItemCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - count = other.count; composeId = other.composeId; + count = other.count; composeItemList.copyFrom(other.composeItemList); } return this; @@ -192,12 +192,12 @@ public final class ComposeItemCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasCount()) { - setCount(other.count); - } if (other.hasComposeId()) { setComposeId(other.composeId); } + if (other.hasCount()) { + setCount(other.count); + } if (other.hasComposeItemList()) { getMutableComposeItemList().mergeFrom(other.composeItemList); } @@ -211,8 +211,8 @@ public final class ComposeItemCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - count = 0; composeId = 0; + count = 0; composeItemList.clear(); return this; } @@ -238,23 +238,23 @@ public final class ComposeItemCsReqOuterClass { } ComposeItemCsReq other = (ComposeItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasCount() || count == other.count) && (!hasComposeId() || composeId == other.composeId) + && (!hasCount() || count == other.count) && (!hasComposeItemList() || composeItemList.equals(other.composeItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(count); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(composeId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(count); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 26); output.writeMessageNoTag(composeItemList); } } @@ -263,10 +263,10 @@ public final class ComposeItemCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList); @@ -281,25 +281,25 @@ public final class ComposeItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // count - count = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 40: { // composeId composeId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 48) { break; } } - case 66: { + case 48: { + // count + count = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 26) { + break; + } + } + case 26: { // composeItemList input.readMessage(composeItemList); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public final class ComposeItemCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.composeItemList, composeItemList); @@ -344,10 +344,11 @@ public final class ComposeItemCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -355,11 +356,10 @@ public final class ComposeItemCsReqOuterClass { } break; } - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class ComposeItemCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName count = FieldName.forField("count"); - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName count = FieldName.forField("count"); + static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java index cdcdc5a..11e8e7e 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 = 10; - */ - private int retcode; - - /** - * optional uint32 compose_id = 15; + * optional uint32 compose_id = 1; */ private int composeId; /** - * optional .ItemList return_item_list = 14; + * optional uint32 count = 2; + */ + private int count; + + /** + * optional uint32 retcode = 14; + */ + private int retcode; + + /** + * optional .ItemList return_item_list = 8; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -49,99 +49,25 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 count = 3; - * @return whether the count field is set + * optional uint32 compose_id = 1; + * @return whether the composeId field is set */ - public boolean hasCount() { + public boolean hasComposeId() { 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 = 10; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 10; - * @return this - */ - public ComposeItemScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 10; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 10; - * @param value the retcode to set - * @return this - */ - public ComposeItemScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = value; - return this; - } - - /** - * optional uint32 compose_id = 15; - * @return whether the composeId field is set - */ - public boolean hasComposeId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 compose_id = 15; + * optional uint32 compose_id = 1; * @return this */ public ComposeItemScRsp clearComposeId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; composeId = 0; return this; } /** - * optional uint32 compose_id = 15; + * optional uint32 compose_id = 1; * @return the composeId */ public int getComposeId() { @@ -149,18 +75,92 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 compose_id = 15; + * optional uint32 compose_id = 1; * @param value the composeId to set * @return this */ public ComposeItemScRsp setComposeId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; composeId = value; return this; } /** - * optional .ItemList return_item_list = 14; + * optional uint32 count = 2; + * @return whether the count field is set + */ + public boolean hasCount() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 count = 2; + * @return this + */ + public ComposeItemScRsp clearCount() { + bitField0_ &= ~0x00000002; + count = 0; + return this; + } + + /** + * optional uint32 count = 2; + * @return the count + */ + public int getCount() { + return count; + } + + /** + * optional uint32 count = 2; + * @param value the count to set + * @return this + */ + public ComposeItemScRsp setCount(final int value) { + bitField0_ |= 0x00000002; + count = value; + return this; + } + + /** + * optional uint32 retcode = 14; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 14; + * @return this + */ + public ComposeItemScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 14; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 14; + * @param value the retcode to set + * @return this + */ + public ComposeItemScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + /** + * optional .ItemList return_item_list = 8; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -168,7 +168,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 8; * @return this */ public ComposeItemScRsp clearReturnItemList() { @@ -178,7 +178,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_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. @@ -192,7 +192,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_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 @@ -206,7 +206,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 8; * @param value the returnItemList to set * @return this */ @@ -221,9 +221,9 @@ public final class ComposeItemScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + composeId = other.composeId; count = other.count; retcode = other.retcode; - composeId = other.composeId; returnItemList.copyFrom(other.returnItemList); } return this; @@ -235,15 +235,15 @@ public final class ComposeItemScRspOuterClass { return this; } cachedSize = -1; + if (other.hasComposeId()) { + setComposeId(other.composeId); + } if (other.hasCount()) { setCount(other.count); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasComposeId()) { - setComposeId(other.composeId); - } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); } @@ -257,9 +257,9 @@ public final class ComposeItemScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + composeId = 0; count = 0; retcode = 0; - composeId = 0; returnItemList.clear(); return this; } @@ -285,28 +285,28 @@ public final class ComposeItemScRspOuterClass { } ComposeItemScRsp other = (ComposeItemScRsp) o; return bitField0_ == other.bitField0_ + && (!hasComposeId() || composeId == other.composeId) && (!hasCount() || count == other.count) && (!hasRetcode() || retcode == other.retcode) - && (!hasComposeId() || composeId == other.composeId) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @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) 80); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(composeId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(count); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 66); output.writeMessageNoTag(returnItemList); } } @@ -315,13 +315,13 @@ public final class ComposeItemScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -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 != 80) { - break; - } - } - case 80: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 8: { // composeId composeId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 16) { break; } } - case 114: { + case 16: { + // count + count = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000008; @@ -390,13 +390,13 @@ 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.composeId, composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -411,11 +411,23 @@ public final class ComposeItemScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { + if (!input.trySkipNullValue()) { + composeId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 94851343: { if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { count = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -426,18 +438,6 @@ public final class ComposeItemScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { - if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -510,12 +510,12 @@ public final class ComposeItemScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName count = FieldName.forField("count"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java index a448370..b6f6c15 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 = 2; - */ - private int composeId; - - /** - * optional uint32 main_affix_id = 3; - */ - private int mainAffixId; - - /** - * optional uint32 compose_relic_id = 6; + * optional uint32 compose_relic_id = 7; */ private int composeRelicId; /** - * optional uint32 count = 7; + * optional uint32 count = 8; */ private int count; /** - * optional .ItemCostList compose_item_list = 12; + * optional uint32 main_affix_id = 12; + */ + private int mainAffixId; + + /** + * optional uint32 compose_id = 14; + */ + private int composeId; + + /** + * optional .ItemCostList compose_item_list = 10; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -54,99 +54,25 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_id = 2; - * @return whether the composeId field is set + * optional uint32 compose_relic_id = 7; + * @return whether the composeRelicId field is set */ - public boolean hasComposeId() { + public boolean hasComposeRelicId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 compose_id = 2; - * @return this - */ - public ComposeSelectedRelicCsReq clearComposeId() { - bitField0_ &= ~0x00000001; - composeId = 0; - return this; - } - - /** - * optional uint32 compose_id = 2; - * @return the composeId - */ - public int getComposeId() { - return composeId; - } - - /** - * optional uint32 compose_id = 2; - * @param value the composeId to set - * @return this - */ - public ComposeSelectedRelicCsReq setComposeId(final int value) { - bitField0_ |= 0x00000001; - composeId = value; - return this; - } - - /** - * optional uint32 main_affix_id = 3; - * @return whether the mainAffixId field is set - */ - public boolean hasMainAffixId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 main_affix_id = 3; - * @return this - */ - public ComposeSelectedRelicCsReq clearMainAffixId() { - bitField0_ &= ~0x00000002; - mainAffixId = 0; - return this; - } - - /** - * optional uint32 main_affix_id = 3; - * @return the mainAffixId - */ - public int getMainAffixId() { - return mainAffixId; - } - - /** - * optional uint32 main_affix_id = 3; - * @param value the mainAffixId to set - * @return this - */ - public ComposeSelectedRelicCsReq setMainAffixId(final int value) { - bitField0_ |= 0x00000002; - mainAffixId = value; - return this; - } - - /** - * optional uint32 compose_relic_id = 6; - * @return whether the composeRelicId field is set - */ - public boolean hasComposeRelicId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 compose_relic_id = 6; + * optional uint32 compose_relic_id = 7; * @return this */ public ComposeSelectedRelicCsReq clearComposeRelicId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; composeRelicId = 0; return this; } /** - * optional uint32 compose_relic_id = 6; + * optional uint32 compose_relic_id = 7; * @return the composeRelicId */ public int getComposeRelicId() { @@ -154,36 +80,36 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_relic_id = 6; + * optional uint32 compose_relic_id = 7; * @param value the composeRelicId to set * @return this */ public ComposeSelectedRelicCsReq setComposeRelicId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; composeRelicId = value; return this; } /** - * optional uint32 count = 7; + * optional uint32 count = 8; * @return whether the count field is set */ public boolean hasCount() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 count = 7; + * optional uint32 count = 8; * @return this */ public ComposeSelectedRelicCsReq clearCount() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; count = 0; return this; } /** - * optional uint32 count = 7; + * optional uint32 count = 8; * @return the count */ public int getCount() { @@ -191,18 +117,92 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 count = 7; + * optional uint32 count = 8; * @param value the count to set * @return this */ public ComposeSelectedRelicCsReq setCount(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; count = value; return this; } /** - * optional .ItemCostList compose_item_list = 12; + * optional uint32 main_affix_id = 12; + * @return whether the mainAffixId field is set + */ + public boolean hasMainAffixId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 main_affix_id = 12; + * @return this + */ + public ComposeSelectedRelicCsReq clearMainAffixId() { + bitField0_ &= ~0x00000004; + mainAffixId = 0; + return this; + } + + /** + * optional uint32 main_affix_id = 12; + * @return the mainAffixId + */ + public int getMainAffixId() { + return mainAffixId; + } + + /** + * optional uint32 main_affix_id = 12; + * @param value the mainAffixId to set + * @return this + */ + public ComposeSelectedRelicCsReq setMainAffixId(final int value) { + bitField0_ |= 0x00000004; + mainAffixId = value; + return this; + } + + /** + * optional uint32 compose_id = 14; + * @return whether the composeId field is set + */ + public boolean hasComposeId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 compose_id = 14; + * @return this + */ + public ComposeSelectedRelicCsReq clearComposeId() { + bitField0_ &= ~0x00000008; + composeId = 0; + return this; + } + + /** + * optional uint32 compose_id = 14; + * @return the composeId + */ + public int getComposeId() { + return composeId; + } + + /** + * optional uint32 compose_id = 14; + * @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 = 10; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -210,7 +210,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 12; + * optional .ItemCostList compose_item_list = 10; * @return this */ public ComposeSelectedRelicCsReq clearComposeItemList() { @@ -220,7 +220,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 12; + * optional .ItemCostList compose_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. @@ -234,7 +234,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 12; + * optional .ItemCostList compose_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 @@ -248,7 +248,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 12; + * optional .ItemCostList compose_item_list = 10; * @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; - mainAffixId = other.mainAffixId; composeRelicId = other.composeRelicId; count = other.count; + mainAffixId = other.mainAffixId; + composeId = other.composeId; composeItemList.copyFrom(other.composeItemList); } return this; @@ -279,18 +279,18 @@ public final class ComposeSelectedRelicCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasComposeId()) { - setComposeId(other.composeId); - } - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); - } if (other.hasComposeRelicId()) { setComposeRelicId(other.composeRelicId); } if (other.hasCount()) { setCount(other.count); } + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); + } + 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; - mainAffixId = 0; composeRelicId = 0; count = 0; + mainAffixId = 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) - && (!hasMainAffixId() || mainAffixId == other.mainAffixId) && (!hasComposeRelicId() || composeRelicId == other.composeRelicId) && (!hasCount() || count == other.count) + && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!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) 16); - output.writeUInt32NoTag(composeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(mainAffixId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(composeRelicId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(count); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(mainAffixId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(composeId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 82); output.writeMessageNoTag(composeItemList); } } @@ -368,17 +368,17 @@ public final class ComposeSelectedRelicCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + } + if ((bitField0_ & 0x00000008) != 0) { + 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 16: { - // composeId - composeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // mainAffixId - mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 56: { // composeRelicId composeRelicId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 64) { break; } } - case 56: { + case 64: { // count count = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { + if (tag != 96) { break; } } - case 98: { + case 96: { + // mainAffixId + mainAffixId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // composeId + composeId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { // composeItemList input.readMessage(composeItemList); bitField0_ |= 0x00000010; @@ -455,17 +455,17 @@ public final class ComposeSelectedRelicCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.composeRelicId, composeRelicId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.count, count); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); + } + if ((bitField0_ & 0x00000008) != 0) { + 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 1424923132: + case 885799284: { + if (input.isAtField(FieldNames.composeRelicId)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + composeRelicId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -491,23 +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 -1973876974: case -1426712144: { if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1424923132: - case 885799284: { - if (input.isAtField(FieldNames.composeRelicId)) { - if (!input.trySkipNullValue()) { - composeRelicId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -515,10 +514,11 @@ public final class ComposeSelectedRelicCsReqOuterClass { } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -591,14 +591,14 @@ 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 mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); - static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id"); static final FieldName count = FieldName.forField("count"); + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_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 1e7ddbd..4943389 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java @@ -19,17 +19,17 @@ public final class ComposeSelectedRelicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 compose_id = 4; - */ - private int composeId; - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional .ItemList return_item_list = 5; + * optional uint32 compose_id = 15; + */ + private int composeId; + + /** + * optional .ItemList return_item_list = 8; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -44,62 +44,25 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 compose_id = 4; - * @return whether the composeId field is set + * optional uint32 retcode = 10; + * @return whether the retcode field is set */ - public boolean hasComposeId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 compose_id = 4; - * @return this - */ - public ComposeSelectedRelicScRsp clearComposeId() { - bitField0_ &= ~0x00000001; - composeId = 0; - return this; - } - - /** - * optional uint32 compose_id = 4; - * @return the composeId - */ - public int getComposeId() { - return composeId; - } - - /** - * optional uint32 compose_id = 4; - * @param value the composeId to set - * @return this - */ - public ComposeSelectedRelicScRsp setComposeId(final int value) { - bitField0_ |= 0x00000001; - composeId = 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 = 10; * @return this */ public ComposeSelectedRelicScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ public ComposeSelectedRelicScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .ItemList return_item_list = 5; + * optional uint32 compose_id = 15; + * @return whether the composeId field is set + */ + public boolean hasComposeId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 compose_id = 15; + * @return this + */ + public ComposeSelectedRelicScRsp clearComposeId() { + bitField0_ &= ~0x00000002; + 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 ComposeSelectedRelicScRsp setComposeId(final int value) { + bitField0_ |= 0x00000002; + composeId = value; + return this; + } + + /** + * optional .ItemList return_item_list = 8; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -126,7 +126,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 5; + * optional .ItemList return_item_list = 8; * @return this */ public ComposeSelectedRelicScRsp clearReturnItemList() { @@ -136,7 +136,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 5; + * optional .ItemList return_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 ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 5; + * optional .ItemList return_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 ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 5; + * optional .ItemList return_item_list = 8; * @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_; - composeId = other.composeId; retcode = other.retcode; + composeId = other.composeId; returnItemList.copyFrom(other.returnItemList); } return this; @@ -192,12 +192,12 @@ public final class ComposeSelectedRelicScRspOuterClass { return this; } cachedSize = -1; - if (other.hasComposeId()) { - setComposeId(other.composeId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasComposeId()) { + setComposeId(other.composeId); + } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); } @@ -211,8 +211,8 @@ public final class ComposeSelectedRelicScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - composeId = 0; retcode = 0; + composeId = 0; returnItemList.clear(); return this; } @@ -238,23 +238,23 @@ public final class ComposeSelectedRelicScRspOuterClass { } ComposeSelectedRelicScRsp other = (ComposeSelectedRelicScRsp) o; return bitField0_ == other.bitField0_ - && (!hasComposeId() || composeId == other.composeId) && (!hasRetcode() || retcode == other.retcode) + && (!hasComposeId() || composeId == other.composeId) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(composeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(composeId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 66); 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(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -281,25 +281,25 @@ public final class ComposeSelectedRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // composeId - composeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 80: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 120) { break; } } - case 42: { + case 120: { + // composeId + composeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // 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.composeId, composeId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -344,11 +344,10 @@ public final class ComposeSelectedRelicScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -356,10 +355,11 @@ public final class ComposeSelectedRelicScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class ComposeSelectedRelicScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java index d027968..7a1fe8c 100644 --- a/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java @@ -20,12 +20,12 @@ public final class ContentPackageDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_content_id = 11; + * optional uint32 cur_content_id = 2; */ private int curContentId; /** - * repeated .ContentPackageInfo content_package_list = 13; + * repeated .ContentPackageInfo content_package_list = 14; */ private final RepeatedMessage contentPackageList = RepeatedMessage.newEmptyInstance(ContentPackageInfoOuterClass.ContentPackageInfo.getFactory()); @@ -40,7 +40,7 @@ public final class ContentPackageDataOuterClass { } /** - * optional uint32 cur_content_id = 11; + * optional uint32 cur_content_id = 2; * @return whether the curContentId field is set */ public boolean hasCurContentId() { @@ -48,7 +48,7 @@ public final class ContentPackageDataOuterClass { } /** - * optional uint32 cur_content_id = 11; + * optional uint32 cur_content_id = 2; * @return this */ public ContentPackageData clearCurContentId() { @@ -58,7 +58,7 @@ public final class ContentPackageDataOuterClass { } /** - * optional uint32 cur_content_id = 11; + * optional uint32 cur_content_id = 2; * @return the curContentId */ public int getCurContentId() { @@ -66,7 +66,7 @@ public final class ContentPackageDataOuterClass { } /** - * optional uint32 cur_content_id = 11; + * optional uint32 cur_content_id = 2; * @param value the curContentId to set * @return this */ @@ -77,7 +77,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 13; + * repeated .ContentPackageInfo content_package_list = 14; * @return whether the contentPackageList field is set */ public boolean hasContentPackageList() { @@ -85,7 +85,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 13; + * repeated .ContentPackageInfo content_package_list = 14; * @return this */ public ContentPackageData clearContentPackageList() { @@ -95,7 +95,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 13; + * repeated .ContentPackageInfo content_package_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. @@ -110,7 +110,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 13; + * repeated .ContentPackageInfo content_package_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 @@ -125,7 +125,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 13; + * repeated .ContentPackageInfo content_package_list = 14; * @param value the contentPackageList to add * @return this */ @@ -137,7 +137,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 13; + * repeated .ContentPackageInfo content_package_list = 14; * @param values the contentPackageList to add * @return this */ @@ -214,12 +214,12 @@ public final class ContentPackageDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(curContentId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < contentPackageList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 114); output.writeMessageNoTag(contentPackageList.get(i)); } } @@ -244,16 +244,16 @@ public final class ContentPackageDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 16: { // curContentId curContentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 114) { break; } } - case 106: { + case 114: { // contentPackageList tag = input.readRepeatedMessage(contentPackageList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java index d8b07d9..401267e 100644 --- a/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java @@ -19,12 +19,12 @@ public final class ContentPackageGetDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .ContentPackageData data = 7; + * optional .ContentPackageData data = 6; */ private final ContentPackageDataOuterClass.ContentPackageData data = ContentPackageDataOuterClass.ContentPackageData.newInstance(); @@ -39,7 +39,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return this */ public ContentPackageGetDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 7; + * optional .ContentPackageData data = 6; * @return whether the data field is set */ public boolean hasData() { @@ -84,7 +84,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 7; + * optional .ContentPackageData data = 6; * @return this */ public ContentPackageGetDataScRsp clearData() { @@ -94,7 +94,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 7; + * optional .ContentPackageData 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. @@ -108,7 +108,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 7; + * optional .ContentPackageData 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 @@ -122,7 +122,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 7; + * optional .ContentPackageData data = 6; * @param value the data to set * @return this */ @@ -199,11 +199,11 @@ public final class ContentPackageGetDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 50); output.writeMessageNoTag(data); } } @@ -227,16 +227,16 @@ public final class ContentPackageGetDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 50) { break; } } - case 58: { + case 50: { // data input.readMessage(data); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java index be63f16..e6843d0 100644 --- a/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java @@ -24,7 +24,7 @@ public final class ContentPackageInfoOuterClass { private int contentId; /** - * optional .ContentPackageStatus status = 7; + * optional .ContentPackageStatus status = 12; */ private int status; @@ -76,7 +76,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional .ContentPackageStatus status = 7; + * optional .ContentPackageStatus status = 12; * @return whether the status field is set */ public boolean hasStatus() { @@ -84,7 +84,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional .ContentPackageStatus status = 7; + * optional .ContentPackageStatus status = 12; * @return this */ public ContentPackageInfo clearStatus() { @@ -94,7 +94,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional .ContentPackageStatus status = 7; + * optional .ContentPackageStatus status = 12; * @return the status */ public ContentPackageStatusOuterClass.ContentPackageStatus getStatus() { @@ -127,7 +127,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional .ContentPackageStatus status = 7; + * optional .ContentPackageStatus status = 12; * @param value the status to set * @return this */ @@ -207,7 +207,7 @@ public final class ContentPackageInfoOuterClass { output.writeUInt32NoTag(contentId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeEnumNoTag(status); } } @@ -236,11 +236,11 @@ public final class ContentPackageInfoOuterClass { contentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { + case 96: { // status final int value = input.readInt32(); if (ContentPackageStatusOuterClass.ContentPackageStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageStatusOuterClass.java index e15ff15..ab84abc 100644 --- a/src/generated/main/emu/lunarcore/proto/ContentPackageStatusOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageStatusOuterClass.java @@ -77,7 +77,7 @@ public final class ContentPackageStatusOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return ContentPackageStatusConverter.INSTANCE; } @@ -99,7 +99,7 @@ public final class ContentPackageStatusOuterClass { return value == null ? other : value; } - enum ContentPackageStatusConverter implements EnumConverter { + enum ContentPackageStatusConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final ContentPackageStatus[] lookup = new ContentPackageStatus[4]; diff --git a/src/generated/main/emu/lunarcore/proto/CurPetChangedScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/CurPetChangedScNotifyOuterClass.java new file mode 100644 index 0000000..6b3a317 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/CurPetChangedScNotifyOuterClass.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 CurPetChangedScNotifyOuterClass { + /** + * Protobuf type {@code CurPetChangedScNotify} + */ + public static final class CurPetChangedScNotify extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 cur_pet_id = 8; + */ + private int curPetId; + + private CurPetChangedScNotify() { + } + + /** + * @return a new empty instance of {@code CurPetChangedScNotify} + */ + public static CurPetChangedScNotify newInstance() { + return new CurPetChangedScNotify(); + } + + /** + * optional uint32 cur_pet_id = 8; + * @return whether the curPetId field is set + */ + public boolean hasCurPetId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 cur_pet_id = 8; + * @return this + */ + public CurPetChangedScNotify clearCurPetId() { + bitField0_ &= ~0x00000001; + curPetId = 0; + return this; + } + + /** + * optional uint32 cur_pet_id = 8; + * @return the curPetId + */ + public int getCurPetId() { + return curPetId; + } + + /** + * optional uint32 cur_pet_id = 8; + * @param value the curPetId to set + * @return this + */ + public CurPetChangedScNotify setCurPetId(final int value) { + bitField0_ |= 0x00000001; + curPetId = value; + return this; + } + + @Override + public CurPetChangedScNotify copyFrom(final CurPetChangedScNotify other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + curPetId = other.curPetId; + } + return this; + } + + @Override + public CurPetChangedScNotify mergeFrom(final CurPetChangedScNotify other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasCurPetId()) { + setCurPetId(other.curPetId); + } + return this; + } + + @Override + public CurPetChangedScNotify clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + curPetId = 0; + return this; + } + + @Override + public CurPetChangedScNotify 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 CurPetChangedScNotify)) { + return false; + } + CurPetChangedScNotify other = (CurPetChangedScNotify) o; + return bitField0_ == other.bitField0_ + && (!hasCurPetId() || curPetId == other.curPetId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(curPetId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curPetId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public CurPetChangedScNotify mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 64: { + // curPetId + curPetId = 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.curPetId, curPetId); + } + output.endObject(); + } + + @Override + public CurPetChangedScNotify mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 544007226: + case -465065190: { + if (input.isAtField(FieldNames.curPetId)) { + if (!input.trySkipNullValue()) { + curPetId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public CurPetChangedScNotify clone() { + return new CurPetChangedScNotify().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static CurPetChangedScNotify parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new CurPetChangedScNotify(), data).checkInitialized(); + } + + public static CurPetChangedScNotify parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new CurPetChangedScNotify(), input).checkInitialized(); + } + + public static CurPetChangedScNotify parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new CurPetChangedScNotify(), input).checkInitialized(); + } + + /** + * @return factory for creating CurPetChangedScNotify messages + */ + public static MessageFactory getFactory() { + return CurPetChangedScNotifyFactory.INSTANCE; + } + + private enum CurPetChangedScNotifyFactory implements MessageFactory { + INSTANCE; + + @Override + public CurPetChangedScNotify create() { + return CurPetChangedScNotify.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName curPetId = FieldName.forField("curPetId", "cur_pet_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java index 2438821..2a2ccc5 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 = 9; + * optional uint32 daily_active_point = 13; */ private int dailyActivePoint; /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 6; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 11; + * repeated .DailyActivityInfo daily_active_level_list = 10; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -46,7 +46,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 13; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -54,7 +54,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 13; * @return this */ public DailyActiveInfoNotify clearDailyActivePoint() { @@ -64,7 +64,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 13; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -72,7 +72,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 13; * @param value the dailyActivePoint to set * @return this */ @@ -83,7 +83,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 6; * @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 = 14; + * repeated uint32 daily_active_quest_id_list = 6; * @return this */ public DailyActiveInfoNotify clearDailyActiveQuestIdList() { @@ -101,7 +101,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_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. @@ -115,7 +115,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_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 @@ -129,7 +129,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 6; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -140,7 +140,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 6; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -151,7 +151,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 11; + * repeated .DailyActivityInfo daily_active_level_list = 10; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -159,7 +159,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 11; + * repeated .DailyActivityInfo daily_active_level_list = 10; * @return this */ public DailyActiveInfoNotify clearDailyActiveLevelList() { @@ -169,7 +169,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 11; + * repeated .DailyActivityInfo daily_active_level_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. @@ -184,7 +184,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 11; + * repeated .DailyActivityInfo daily_active_level_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 @@ -199,7 +199,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 11; + * repeated .DailyActivityInfo daily_active_level_list = 10; * @param value the dailyActiveLevelList to add * @return this */ @@ -211,7 +211,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 11; + * repeated .DailyActivityInfo daily_active_level_list = 10; * @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) 72); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 82); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -334,25 +334,25 @@ public final class DailyActiveInfoNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 104: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 50) { break; } } - case 114: { + case 50: { // dailyActiveQuestIdList [packed=true] input.readPackedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 82) { break; } } - case 90: { + case 82: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000004; @@ -370,7 +370,7 @@ public final class DailyActiveInfoNotifyOuterClass { tag = input.readTag(); break; } - case 112: { + case 48: { // 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 907e949..ee3a5a6 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java @@ -19,22 +19,22 @@ public final class DailyActivityInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 4; + * optional uint32 level = 1; */ private int level; /** - * optional uint32 daily_active_point = 10; - */ - private int dailyActivePoint; - - /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 3; */ private int worldLevel; /** - * optional bool is_has_taken = 13; + * optional uint32 daily_active_point = 13; + */ + private int dailyActivePoint; + + /** + * optional bool is_has_taken = 2; */ private boolean isHasTaken; @@ -49,7 +49,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 1; * @return whether the level field is set */ public boolean hasLevel() { @@ -57,7 +57,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 1; * @return this */ public DailyActivityInfo clearLevel() { @@ -67,7 +67,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 1; * @return the level */ public int getLevel() { @@ -75,7 +75,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 1; * @param value the level to set * @return this */ @@ -86,62 +86,25 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 daily_active_point = 10; - * @return whether the dailyActivePoint field is set + * optional uint32 world_level = 3; + * @return whether the worldLevel field is set */ - public boolean hasDailyActivePoint() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 daily_active_point = 10; - * @return this - */ - public DailyActivityInfo clearDailyActivePoint() { - bitField0_ &= ~0x00000002; - dailyActivePoint = 0; - return this; - } - - /** - * optional uint32 daily_active_point = 10; - * @return the dailyActivePoint - */ - public int getDailyActivePoint() { - return dailyActivePoint; - } - - /** - * optional uint32 daily_active_point = 10; - * @param value the dailyActivePoint to set - * @return this - */ - public DailyActivityInfo setDailyActivePoint(final int value) { - bitField0_ |= 0x00000002; - dailyActivePoint = value; - return this; - } - - /** - * optional uint32 world_level = 11; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 3; * @return this */ public DailyActivityInfo clearWorldLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; worldLevel = 0; return this; } /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 3; * @return the worldLevel */ public int getWorldLevel() { @@ -149,18 +112,55 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 3; * @param value the worldLevel to set * @return this */ public DailyActivityInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; worldLevel = value; return this; } /** - * optional bool is_has_taken = 13; + * optional uint32 daily_active_point = 13; + * @return whether the dailyActivePoint field is set + */ + public boolean hasDailyActivePoint() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 daily_active_point = 13; + * @return this + */ + public DailyActivityInfo clearDailyActivePoint() { + bitField0_ &= ~0x00000004; + dailyActivePoint = 0; + return this; + } + + /** + * optional uint32 daily_active_point = 13; + * @return the dailyActivePoint + */ + public int getDailyActivePoint() { + return dailyActivePoint; + } + + /** + * optional uint32 daily_active_point = 13; + * @param value the dailyActivePoint to set + * @return this + */ + public DailyActivityInfo setDailyActivePoint(final int value) { + bitField0_ |= 0x00000004; + dailyActivePoint = value; + return this; + } + + /** + * optional bool is_has_taken = 2; * @return whether the isHasTaken field is set */ public boolean hasIsHasTaken() { @@ -168,7 +168,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 13; + * optional bool is_has_taken = 2; * @return this */ public DailyActivityInfo clearIsHasTaken() { @@ -178,7 +178,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 13; + * optional bool is_has_taken = 2; * @return the isHasTaken */ public boolean getIsHasTaken() { @@ -186,7 +186,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 13; + * optional bool is_has_taken = 2; * @param value the isHasTaken to set * @return this */ @@ -202,8 +202,8 @@ public final class DailyActivityInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; level = other.level; - dailyActivePoint = other.dailyActivePoint; worldLevel = other.worldLevel; + dailyActivePoint = other.dailyActivePoint; isHasTaken = other.isHasTaken; } return this; @@ -218,12 +218,12 @@ public final class DailyActivityInfoOuterClass { if (other.hasLevel()) { setLevel(other.level); } - if (other.hasDailyActivePoint()) { - setDailyActivePoint(other.dailyActivePoint); - } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } + if (other.hasDailyActivePoint()) { + setDailyActivePoint(other.dailyActivePoint); + } if (other.hasIsHasTaken()) { setIsHasTaken(other.isHasTaken); } @@ -238,8 +238,8 @@ public final class DailyActivityInfoOuterClass { cachedSize = -1; bitField0_ = 0; level = 0; - dailyActivePoint = 0; worldLevel = 0; + dailyActivePoint = 0; isHasTaken = false; return this; } @@ -265,27 +265,27 @@ public final class DailyActivityInfoOuterClass { DailyActivityInfo other = (DailyActivityInfo) o; return bitField0_ == other.bitField0_ && (!hasLevel() || level == other.level) - && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint) && (!hasWorldLevel() || worldLevel == other.worldLevel) + && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint) && (!hasIsHasTaken() || isHasTaken == other.isHasTaken); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(dailyActivePoint); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(worldLevel); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 104); + output.writeUInt32NoTag(dailyActivePoint); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 16); output.writeBoolNoTag(isHasTaken); } } @@ -297,10 +297,10 @@ public final class DailyActivityInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); } if ((bitField0_ & 0x00000008) != 0) { size += 2; @@ -315,34 +315,34 @@ public final class DailyActivityInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { // level level = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 24) { break; } } - case 80: { - // dailyActivePoint - dailyActivePoint = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 24: { // worldLevel worldLevel = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 104) { break; } } case 104: { + // dailyActivePoint + dailyActivePoint = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { // isHasTaken isHasTaken = input.readBool(); bitField0_ |= 0x00000008; @@ -372,10 +372,10 @@ public final class DailyActivityInfoOuterClass { output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); } if ((bitField0_ & 0x00000008) != 0) { output.writeBool(FieldNames.isHasTaken, isHasTaken); @@ -401,11 +401,11 @@ public final class DailyActivityInfoOuterClass { } break; } - case 859671121: - case 1952864125: { - if (input.isAtField(FieldNames.dailyActivePoint)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - dailyActivePoint = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -413,11 +413,11 @@ public final class DailyActivityInfoOuterClass { } break; } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case 859671121: + case 1952864125: { + if (input.isAtField(FieldNames.dailyActivePoint)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -492,10 +492,10 @@ public final class DailyActivityInfoOuterClass { static class FieldNames { static final FieldName level = FieldName.forField("level"); - static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); + static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point"); + static final FieldName isHasTaken = FieldName.forField("isHasTaken", "is_has_taken"); } } diff --git a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java index 74bac16..abb4ef6 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 = 3; + * optional uint32 entity_id = 8; */ private int entityId; @@ -34,7 +34,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 8; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -42,7 +42,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 8; * @return this */ public DeactivateFarmElementCsReq clearEntityId() { @@ -52,7 +52,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 8; * @return the entityId */ public int getEntityId() { @@ -60,7 +60,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 8; * @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) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(entityId); } } @@ -150,7 +150,7 @@ public final class DeactivateFarmElementCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // 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 2acdfd9..a518134 100644 --- a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java @@ -19,15 +19,15 @@ public final class DeactivateFarmElementScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; - */ - private int retcode; - - /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 4; */ private int entityId; + /** + * optional uint32 retcode = 7; + */ + private int retcode; + private DeactivateFarmElementScRsp() { } @@ -39,62 +39,25 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 entity_id = 4; + * @return whether the entityId field is set */ - public boolean hasRetcode() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public DeactivateFarmElementScRsp 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 DeactivateFarmElementScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 entity_id = 11; - * @return whether the entityId field is set - */ - public boolean hasEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 4; * @return this */ public DeactivateFarmElementScRsp clearEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entityId = 0; return this; } /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 4; * @return the entityId */ public int getEntityId() { @@ -102,23 +65,60 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 4; * @param value the entityId to set * @return this */ public DeactivateFarmElementScRsp setEntityId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entityId = value; return this; } + /** + * optional uint32 retcode = 7; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 7; + * @return this + */ + public DeactivateFarmElementScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + 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 DeactivateFarmElementScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public DeactivateFarmElementScRsp copyFrom(final DeactivateFarmElementScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; entityId = other.entityId; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class DeactivateFarmElementScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasEntityId()) { setEntityId(other.entityId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class DeactivateFarmElementScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; entityId = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class DeactivateFarmElementScRspOuterClass { } DeactivateFarmElementScRsp other = (DeactivateFarmElementScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasEntityId() || entityId == other.entityId); + && (!hasEntityId() || entityId == other.entityId) + && (!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) 32); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class DeactivateFarmElementScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class DeactivateFarmElementScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // retcode - retcode = input.readUInt32(); + case 32: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 56) { break; } } - case 88: { - // entityId - entityId = input.readUInt32(); + case 56: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class DeactivateFarmElementScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public final class DeactivateFarmElementScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class DeactivateFarmElementScRspOuterClass { } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class DeactivateFarmElementScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java index a421ed1..5916a40 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 = 2; + * repeated uint32 id_list = 14; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 2; + * repeated uint32 id_list = 14; * @return whether the idList field is set */ public boolean hasIdList() { @@ -43,7 +43,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 2; + * repeated uint32 id_list = 14; * @return this */ public DelMailCsReq clearIdList() { @@ -53,7 +53,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 2; + * repeated uint32 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 DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 2; + * repeated uint32 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 DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 2; + * repeated uint32 id_list = 14; * @param value the idList to add * @return this */ @@ -92,7 +92,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 2; + * repeated uint32 id_list = 14; * @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) 16); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(idList.array()[i]); } } @@ -185,7 +185,7 @@ public final class DelMailCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 114: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class DelMailCsReqOuterClass { tag = input.readTag(); break; } - case 16: { + case 112: { // 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 96c909f..1ef1caf 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 = 3; + * optional uint32 retcode = 13; */ private int retcode; /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 15; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 13; * @return this */ public DelMailScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 15; * @return whether the idList field is set */ public boolean hasIdList() { @@ -85,7 +85,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 15; * @return this */ public DelMailScRsp clearIdList() { @@ -95,7 +95,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 13; + * repeated uint32 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 @@ -123,7 +123,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 15; * @param value the idList to add * @return this */ @@ -134,7 +134,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 15; * @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) 24); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < idList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(idList.array()[i]); } } @@ -240,16 +240,16 @@ public final class DelMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 122) { break; } } - case 106: { + case 122: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class DelMailScRspOuterClass { tag = input.readTag(); break; } - case 104: { + case 120: { // 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 304e9c7..4cb309b 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 = 11; + * optional uint32 uid = 12; */ private int uid; @@ -34,7 +34,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 12; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 12; * @return this */ public DeleteFriendCsReq clearUid() { @@ -52,7 +52,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 12; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 12; * @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) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class DeleteFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 96: { // 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 index 48668ef..22102f4 100644 --- a/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class DeleteSocialEventServerCacheCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 delete_cache = 9; + * repeated uint32 delete_cache = 13; */ private final RepeatedInt deleteCache = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class DeleteSocialEventServerCacheCsReqOuterClass { } /** - * repeated uint32 delete_cache = 9; + * repeated uint32 delete_cache = 13; * @return whether the deleteCache field is set */ public boolean hasDeleteCache() { @@ -43,7 +43,7 @@ public final class DeleteSocialEventServerCacheCsReqOuterClass { } /** - * repeated uint32 delete_cache = 9; + * repeated uint32 delete_cache = 13; * @return this */ public DeleteSocialEventServerCacheCsReq clearDeleteCache() { @@ -53,7 +53,7 @@ public final class DeleteSocialEventServerCacheCsReqOuterClass { } /** - * repeated uint32 delete_cache = 9; + * repeated uint32 delete_cache = 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 DeleteSocialEventServerCacheCsReqOuterClass { } /** - * repeated uint32 delete_cache = 9; + * repeated uint32 delete_cache = 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 DeleteSocialEventServerCacheCsReqOuterClass { } /** - * repeated uint32 delete_cache = 9; + * repeated uint32 delete_cache = 13; * @param value the deleteCache to add * @return this */ @@ -92,7 +92,7 @@ public final class DeleteSocialEventServerCacheCsReqOuterClass { } /** - * repeated uint32 delete_cache = 9; + * repeated uint32 delete_cache = 13; * @param values the deleteCache to add * @return this */ @@ -165,7 +165,7 @@ public final class DeleteSocialEventServerCacheCsReqOuterClass { 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.writeRawByte((byte) 104); output.writeUInt32NoTag(deleteCache.array()[i]); } } @@ -187,7 +187,7 @@ public final class DeleteSocialEventServerCacheCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 106: { // deleteCache [packed=true] input.readPackedUInt32(deleteCache, tag); bitField0_ |= 0x00000001; @@ -206,7 +206,7 @@ public final class DeleteSocialEventServerCacheCsReqOuterClass { tag = input.readTag(); break; } - case 72: { + case 104: { // deleteCache [packed=false] tag = input.readRepeatedUInt32(deleteCache, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheScRspOuterClass.java index 2c34aaa..5c713c4 100644 --- a/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheScRspOuterClass.java @@ -20,12 +20,12 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated uint32 ret_delete_cache = 5; + * repeated uint32 ret_delete_cache = 1; */ private final RepeatedInt retDeleteCache = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; * @return this */ public DeleteSocialEventServerCacheScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { } /** - * repeated uint32 ret_delete_cache = 5; + * repeated uint32 ret_delete_cache = 1; * @return whether the retDeleteCache field is set */ public boolean hasRetDeleteCache() { @@ -85,7 +85,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { } /** - * repeated uint32 ret_delete_cache = 5; + * repeated uint32 ret_delete_cache = 1; * @return this */ public DeleteSocialEventServerCacheScRsp clearRetDeleteCache() { @@ -95,7 +95,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { } /** - * repeated uint32 ret_delete_cache = 5; + * repeated uint32 ret_delete_cache = 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 DeleteSocialEventServerCacheScRspOuterClass { } /** - * repeated uint32 ret_delete_cache = 5; + * repeated uint32 ret_delete_cache = 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 DeleteSocialEventServerCacheScRspOuterClass { } /** - * repeated uint32 ret_delete_cache = 5; + * repeated uint32 ret_delete_cache = 1; * @param value the retDeleteCache to add * @return this */ @@ -134,7 +134,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { } /** - * repeated uint32 ret_delete_cache = 5; + * repeated uint32 ret_delete_cache = 1; * @param values the retDeleteCache to add * @return this */ @@ -212,12 +212,12 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < retDeleteCache.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retDeleteCache.array()[i]); } } @@ -242,16 +242,16 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 10) { break; } } - case 42: { + case 10: { // retDeleteCache [packed=true] input.readPackedUInt32(retDeleteCache, tag); bitField0_ |= 0x00000002; @@ -270,7 +270,7 @@ public final class DeleteSocialEventServerCacheScRspOuterClass { tag = input.readTag(); break; } - case 40: { + case 8: { // retDeleteCache [packed=false] tag = input.readRepeatedUInt32(retDeleteCache, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java index 1d28ed3..0888367 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 = 2; + * optional .RotaterData rotater_data = 15; */ private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); @@ -34,7 +34,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 2; + * optional .RotaterData rotater_data = 15; * @return whether the rotaterData field is set */ public boolean hasRotaterData() { @@ -42,7 +42,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 2; + * optional .RotaterData rotater_data = 15; * @return this */ public DeployRotaterCsReq clearRotaterData() { @@ -52,7 +52,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 2; + * optional .RotaterData rotater_data = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 2; + * optional .RotaterData rotater_data = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 2; + * optional .RotaterData rotater_data = 15; * @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) 18); + output.writeRawByte((byte) 122); output.writeMessageNoTag(rotaterData); } } @@ -171,7 +171,7 @@ public final class DeployRotaterCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 122: { // 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 248c404..9add7ab 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 = 7; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .RotaterData rotater_data = 6; - */ - private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); - - /** - * optional .RotatorEnergyInfo energy_info = 10; + * optional .RotatorEnergyInfo energy_info = 4; */ private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); + /** + * optional .RotaterData rotater_data = 10; + */ + private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); + private DeployRotaterScRsp() { } @@ -44,7 +44,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; * @return this */ public DeployRotaterScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -81,82 +81,25 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotaterData rotater_data = 6; - * @return whether the rotaterData field is set + * optional .RotatorEnergyInfo energy_info = 4; + * @return whether the energyInfo field is set */ - public boolean hasRotaterData() { + public boolean hasEnergyInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RotaterData rotater_data = 6; - * @return this - */ - public DeployRotaterScRsp clearRotaterData() { - bitField0_ &= ~0x00000002; - 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_ |= 0x00000002; - return rotaterData; - } - - /** - * optional .RotaterData rotater_data = 6; - * @param value the rotaterData to set - * @return this - */ - public DeployRotaterScRsp setRotaterData(final RotaterDataOuterClass.RotaterData value) { - 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; + * optional .RotatorEnergyInfo energy_info = 4; * @return this */ public DeployRotaterScRsp clearEnergyInfo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; energyInfo.clear(); return this; } /** - * optional .RotatorEnergyInfo energy_info = 10; + * optional .RotatorEnergyInfo energy_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. @@ -170,7 +113,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 10; + * optional .RotatorEnergyInfo energy_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 @@ -179,30 +122,87 @@ public final class DeployRotaterScRspOuterClass { * @return internal storage object for modifications */ public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getMutableEnergyInfo() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return energyInfo; } /** - * optional .RotatorEnergyInfo energy_info = 10; + * optional .RotatorEnergyInfo energy_info = 4; * @param value the energyInfo to set * @return this */ public DeployRotaterScRsp setEnergyInfo( final RotatorEnergyInfoOuterClass.RotatorEnergyInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; energyInfo.copyFrom(value); return this; } + /** + * optional .RotaterData rotater_data = 10; + * @return whether the rotaterData field is set + */ + public boolean hasRotaterData() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RotaterData rotater_data = 10; + * @return this + */ + public DeployRotaterScRsp clearRotaterData() { + bitField0_ &= ~0x00000004; + rotaterData.clear(); + return this; + } + + /** + * optional .RotaterData rotater_data = 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 #getMutableRotaterData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RotaterDataOuterClass.RotaterData getRotaterData() { + return rotaterData; + } + + /** + * optional .RotaterData rotater_data = 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 RotaterDataOuterClass.RotaterData getMutableRotaterData() { + bitField0_ |= 0x00000004; + return rotaterData; + } + + /** + * optional .RotaterData rotater_data = 10; + * @param value the rotaterData to set + * @return this + */ + public DeployRotaterScRsp setRotaterData(final RotaterDataOuterClass.RotaterData value) { + bitField0_ |= 0x00000004; + rotaterData.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; - rotaterData.copyFrom(other.rotaterData); energyInfo.copyFrom(other.energyInfo); + rotaterData.copyFrom(other.rotaterData); } return this; } @@ -216,12 +216,12 @@ public final class DeployRotaterScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasRotaterData()) { - getMutableRotaterData().mergeFrom(other.rotaterData); - } if (other.hasEnergyInfo()) { getMutableEnergyInfo().mergeFrom(other.energyInfo); } + if (other.hasRotaterData()) { + getMutableRotaterData().mergeFrom(other.rotaterData); + } return this; } @@ -233,8 +233,8 @@ public final class DeployRotaterScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - rotaterData.clear(); energyInfo.clear(); + rotaterData.clear(); return this; } @@ -245,8 +245,8 @@ public final class DeployRotaterScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - rotaterData.clearQuick(); energyInfo.clearQuick(); + rotaterData.clearQuick(); return this; } @@ -261,23 +261,23 @@ public final class DeployRotaterScRspOuterClass { DeployRotaterScRsp other = (DeployRotaterScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasRotaterData() || rotaterData.equals(other.rotaterData)) - && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)); + && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)) + && (!hasRotaterData() || rotaterData.equals(other.rotaterData)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(rotaterData); + output.writeRawByte((byte) 34); + output.writeMessageNoTag(energyInfo); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 82); - output.writeMessageNoTag(energyInfo); + output.writeMessageNoTag(rotaterData); } } @@ -288,10 +288,10 @@ public final class DeployRotaterScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData); + size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData); } return size; } @@ -303,18 +303,18 @@ public final class DeployRotaterScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 34) { break; } } - case 50: { - // rotaterData - input.readMessage(rotaterData); + case 34: { + // energyInfo + input.readMessage(energyInfo); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 82) { @@ -322,8 +322,8 @@ public final class DeployRotaterScRspOuterClass { } } case 82: { - // energyInfo - input.readMessage(energyInfo); + // rotaterData + input.readMessage(rotaterData); 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.rotaterData, rotaterData); + output.writeMessage(FieldNames.energyInfo, energyInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.energyInfo, energyInfo); + output.writeMessage(FieldNames.rotaterData, rotaterData); } output.endObject(); } @@ -377,11 +377,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_ |= 0x00000002; } } else { @@ -389,11 +389,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_ |= 0x00000004; } } else { @@ -456,9 +456,9 @@ public final class DeployRotaterScRspOuterClass { 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"); + + static final FieldName rotaterData = FieldName.forField("rotaterData", "rotater_data"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java index 4ea23b0..e5191e6 100644 --- a/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java @@ -19,20 +19,20 @@ public final class DestroyItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 item_count = 5; + * optional uint32 item_count = 1; */ private int itemCount; /** - * optional uint32 cur_item_count = 8; - */ - private int curItemCount; - - /** - * optional uint32 item_id = 14; + * optional uint32 item_id = 4; */ private int itemId; + /** + * optional uint32 cur_item_count = 12; + */ + private int curItemCount; + private DestroyItemCsReq() { } @@ -44,7 +44,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 5; + * optional uint32 item_count = 1; * @return whether the itemCount field is set */ public boolean hasItemCount() { @@ -52,7 +52,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 5; + * optional uint32 item_count = 1; * @return this */ public DestroyItemCsReq clearItemCount() { @@ -62,7 +62,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 5; + * optional uint32 item_count = 1; * @return the itemCount */ public int getItemCount() { @@ -70,7 +70,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 5; + * optional uint32 item_count = 1; * @param value the itemCount to set * @return this */ @@ -81,62 +81,25 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 cur_item_count = 8; - * @return whether the curItemCount field is set + * optional uint32 item_id = 4; + * @return whether the itemId field is set */ - public boolean hasCurItemCount() { + public boolean hasItemId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 cur_item_count = 8; - * @return this - */ - public DestroyItemCsReq clearCurItemCount() { - bitField0_ &= ~0x00000002; - curItemCount = 0; - return this; - } - - /** - * optional uint32 cur_item_count = 8; - * @return the curItemCount - */ - public int getCurItemCount() { - return curItemCount; - } - - /** - * optional uint32 cur_item_count = 8; - * @param value the curItemCount to set - * @return this - */ - public DestroyItemCsReq setCurItemCount(final int value) { - bitField0_ |= 0x00000002; - curItemCount = value; - return this; - } - - /** - * optional uint32 item_id = 14; - * @return whether the itemId field is set - */ - public boolean hasItemId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 item_id = 14; + * optional uint32 item_id = 4; * @return this */ public DestroyItemCsReq clearItemId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; itemId = 0; return this; } /** - * optional uint32 item_id = 14; + * optional uint32 item_id = 4; * @return the itemId */ public int getItemId() { @@ -144,24 +107,61 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_id = 14; + * optional uint32 item_id = 4; * @param value the itemId to set * @return this */ public DestroyItemCsReq setItemId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; itemId = value; return this; } + /** + * optional uint32 cur_item_count = 12; + * @return whether the curItemCount field is set + */ + public boolean hasCurItemCount() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cur_item_count = 12; + * @return this + */ + public DestroyItemCsReq clearCurItemCount() { + bitField0_ &= ~0x00000004; + curItemCount = 0; + return this; + } + + /** + * optional uint32 cur_item_count = 12; + * @return the curItemCount + */ + public int getCurItemCount() { + return curItemCount; + } + + /** + * optional uint32 cur_item_count = 12; + * @param value the curItemCount to set + * @return this + */ + public DestroyItemCsReq setCurItemCount(final int value) { + bitField0_ |= 0x00000004; + curItemCount = value; + return this; + } + @Override public DestroyItemCsReq copyFrom(final DestroyItemCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; itemCount = other.itemCount; - curItemCount = other.curItemCount; itemId = other.itemId; + curItemCount = other.curItemCount; } return this; } @@ -175,12 +175,12 @@ public final class DestroyItemCsReqOuterClass { if (other.hasItemCount()) { setItemCount(other.itemCount); } - if (other.hasCurItemCount()) { - setCurItemCount(other.curItemCount); - } if (other.hasItemId()) { setItemId(other.itemId); } + if (other.hasCurItemCount()) { + setCurItemCount(other.curItemCount); + } return this; } @@ -192,8 +192,8 @@ public final class DestroyItemCsReqOuterClass { cachedSize = -1; bitField0_ = 0; itemCount = 0; - curItemCount = 0; itemId = 0; + curItemCount = 0; return this; } @@ -218,23 +218,23 @@ public final class DestroyItemCsReqOuterClass { DestroyItemCsReq other = (DestroyItemCsReq) o; return bitField0_ == other.bitField0_ && (!hasItemCount() || itemCount == other.itemCount) - && (!hasCurItemCount() || curItemCount == other.curItemCount) - && (!hasItemId() || itemId == other.itemId); + && (!hasItemId() || itemId == other.itemId) + && (!hasCurItemCount() || curItemCount == other.curItemCount); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(itemCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(curItemCount); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(curItemCount); } } @@ -245,10 +245,10 @@ public final class DestroyItemCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(itemCount); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curItemCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curItemCount); } return size; } @@ -260,27 +260,27 @@ public final class DestroyItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // itemCount itemCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { - // curItemCount - curItemCount = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 32: { // itemId itemId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // curItemCount + curItemCount = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class DestroyItemCsReqOuterClass { output.writeUInt32(FieldNames.itemCount, itemCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curItemCount, curItemCount); + output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.curItemCount, curItemCount); } output.endObject(); } @@ -335,11 +335,11 @@ public final class DestroyItemCsReqOuterClass { } break; } - case -986513572: - case -1822146494: { - if (input.isAtField(FieldNames.curItemCount)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - curItemCount = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,11 +347,11 @@ public final class DestroyItemCsReqOuterClass { } break; } - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case -986513572: + case -1822146494: { + if (input.isAtField(FieldNames.curItemCount)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + curItemCount = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -414,9 +414,9 @@ public final class DestroyItemCsReqOuterClass { static class FieldNames { static final FieldName itemCount = FieldName.forField("itemCount", "item_count"); - static final FieldName curItemCount = FieldName.forField("curItemCount", "cur_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 c625254..2d82c1f 100644 --- a/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java @@ -167,7 +167,7 @@ public final class DevelopmentTypeOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return DevelopmentTypeConverter.INSTANCE; } @@ -189,7 +189,7 @@ public final class DevelopmentTypeOuterClass { return value == null ? other : value; } - enum DevelopmentTypeConverter implements EnumConverter { + enum DevelopmentTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final DevelopmentType[] lookup = new DevelopmentType[13]; diff --git a/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java index b2fa3b3..7343acf 100644 --- a/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class DiscardRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_discard = 9; + * optional bool is_discard = 6; */ private boolean isDiscard; /** - * repeated uint32 relic_id_list = 15; + * repeated uint32 relic_id_list = 3; */ private final RepeatedInt relicIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 9; + * optional bool is_discard = 6; * @return whether the isDiscard field is set */ public boolean hasIsDiscard() { @@ -48,7 +48,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 9; + * optional bool is_discard = 6; * @return this */ public DiscardRelicCsReq clearIsDiscard() { @@ -58,7 +58,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 9; + * optional bool is_discard = 6; * @return the isDiscard */ public boolean getIsDiscard() { @@ -66,7 +66,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 9; + * optional bool is_discard = 6; * @param value the isDiscard to set * @return this */ @@ -77,7 +77,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * repeated uint32 relic_id_list = 15; + * repeated uint32 relic_id_list = 3; * @return whether the relicIdList field is set */ public boolean hasRelicIdList() { @@ -85,7 +85,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * repeated uint32 relic_id_list = 15; + * repeated uint32 relic_id_list = 3; * @return this */ public DiscardRelicCsReq clearRelicIdList() { @@ -95,7 +95,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * repeated uint32 relic_id_list = 15; + * repeated uint32 relic_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 DiscardRelicCsReqOuterClass { } /** - * repeated uint32 relic_id_list = 15; + * repeated uint32 relic_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 DiscardRelicCsReqOuterClass { } /** - * repeated uint32 relic_id_list = 15; + * repeated uint32 relic_id_list = 3; * @param value the relicIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * repeated uint32 relic_id_list = 15; + * repeated uint32 relic_id_list = 3; * @param values the relicIdList to add * @return this */ @@ -210,12 +210,12 @@ public final class DiscardRelicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isDiscard); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < relicIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(relicIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class DiscardRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 48: { // isDiscard isDiscard = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 26) { break; } } - case 122: { + case 26: { // relicIdList [packed=true] input.readPackedUInt32(relicIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class DiscardRelicCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 24: { // relicIdList [packed=false] tag = input.readRepeatedUInt32(relicIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java index 8c8b334..8e91d5c 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java @@ -21,65 +21,73 @@ public final class DisplayAvatarDetailInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 dressed_skin_id = 4; - */ - private int dressedSkinId; - - /** - * optional uint32 rank = 7; - */ - private int rank; - - /** - * optional uint32 exp = 8; - */ - private int exp; - - /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; */ private int avatarId; /** - * optional uint32 level = 10; - */ - private int level; - - /** - * optional uint32 pos = 12; + * optional uint32 pos = 5; */ private int pos; /** - * optional uint32 promotion = 14; + * optional uint32 promotion = 6; */ private int promotion; /** - * optional .DisplayEquipmentInfo equipment = 5; + * optional uint32 level = 8; + */ + private int level; + + /** + * optional uint32 rank = 10; + */ + private int rank; + + /** + * optional uint32 exp = 12; + */ + private int exp; + + /** + * optional uint32 dressed_skin_id = 14; + */ + private int dressedSkinId; + + /** + * optional .DisplayEquipmentInfo equipment = 15; */ private final DisplayEquipmentInfoOuterClass.DisplayEquipmentInfo equipment = DisplayEquipmentInfoOuterClass.DisplayEquipmentInfo.newInstance(); /** - * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated uint32 all_path_unlocked_special_point_id_list = 999; */ private final RepeatedInt allPathUnlockedSpecialPointIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .AvatarSkillTree skilltree_list = 2; + * repeated .AvatarSkillTree skilltree_list = 7; */ private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); /** - * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; - */ - private final RepeatedMessage allPathSpecialSkilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); - - /** - * repeated .DisplayRelicInfo relic_list = 11; + * repeated .DisplayRelicInfo relic_list = 13; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(DisplayRelicInfoOuterClass.DisplayRelicInfo.getFactory()); + /** + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated .AvatarSkillTree all_path_special_skilltree_list = 9999; + */ + private final RepeatedMessage allPathSpecialSkilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + private DisplayAvatarDetailInfo() { } @@ -91,136 +99,25 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 dressed_skin_id = 4; - * @return whether the dressedSkinId field is set + * optional uint32 avatar_id = 1; + * @return whether the avatarId field is set */ - public boolean hasDressedSkinId() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 dressed_skin_id = 4; - * @return this - */ - public DisplayAvatarDetailInfo clearDressedSkinId() { - bitField0_ &= ~0x00000001; - dressedSkinId = 0; - return this; - } - - /** - * optional uint32 dressed_skin_id = 4; - * @return the dressedSkinId - */ - public int getDressedSkinId() { - return dressedSkinId; - } - - /** - * optional uint32 dressed_skin_id = 4; - * @param value the dressedSkinId to set - * @return this - */ - public DisplayAvatarDetailInfo setDressedSkinId(final int value) { - bitField0_ |= 0x00000001; - dressedSkinId = value; - return this; - } - - /** - * optional uint32 rank = 7; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 rank = 7; - * @return this - */ - public DisplayAvatarDetailInfo clearRank() { - bitField0_ &= ~0x00000002; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 7; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 7; - * @param value the rank to set - * @return this - */ - public DisplayAvatarDetailInfo setRank(final int value) { - bitField0_ |= 0x00000002; - rank = value; - return this; - } - - /** - * optional uint32 exp = 8; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 exp = 8; - * @return this - */ - public DisplayAvatarDetailInfo clearExp() { - bitField0_ &= ~0x00000004; - exp = 0; - return this; - } - - /** - * optional uint32 exp = 8; - * @return the exp - */ - public int getExp() { - return exp; - } - - /** - * optional uint32 exp = 8; - * @param value the exp to set - * @return this - */ - public DisplayAvatarDetailInfo setExp(final int value) { - bitField0_ |= 0x00000004; - exp = value; - return this; - } - - /** - * optional uint32 avatar_id = 9; - * @return whether the avatarId field is set - */ - public boolean hasAvatarId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @return this */ public DisplayAvatarDetailInfo clearAvatarId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @return the avatarId */ public int getAvatarId() { @@ -228,73 +125,36 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @param value the avatarId to set * @return this */ public DisplayAvatarDetailInfo setAvatarId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; avatarId = value; return this; } /** - * optional uint32 level = 10; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 level = 10; - * @return this - */ - public DisplayAvatarDetailInfo clearLevel() { - bitField0_ &= ~0x00000010; - 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 DisplayAvatarDetailInfo setLevel(final int value) { - bitField0_ |= 0x00000010; - level = value; - return this; - } - - /** - * optional uint32 pos = 12; + * optional uint32 pos = 5; * @return whether the pos field is set */ public boolean hasPos() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 pos = 12; + * optional uint32 pos = 5; * @return this */ public DisplayAvatarDetailInfo clearPos() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000002; pos = 0; return this; } /** - * optional uint32 pos = 12; + * optional uint32 pos = 5; * @return the pos */ public int getPos() { @@ -302,36 +162,36 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 pos = 12; + * optional uint32 pos = 5; * @param value the pos to set * @return this */ public DisplayAvatarDetailInfo setPos(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; pos = value; return this; } /** - * optional uint32 promotion = 14; + * optional uint32 promotion = 6; * @return whether the promotion field is set */ public boolean hasPromotion() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 promotion = 14; + * optional uint32 promotion = 6; * @return this */ public DisplayAvatarDetailInfo clearPromotion() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000004; promotion = 0; return this; } /** - * optional uint32 promotion = 14; + * optional uint32 promotion = 6; * @return the promotion */ public int getPromotion() { @@ -339,18 +199,166 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 promotion = 14; + * optional uint32 promotion = 6; * @param value the promotion to set * @return this */ public DisplayAvatarDetailInfo setPromotion(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; promotion = value; return this; } /** - * optional .DisplayEquipmentInfo equipment = 5; + * 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 DisplayAvatarDetailInfo 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 DisplayAvatarDetailInfo setLevel(final int value) { + bitField0_ |= 0x00000008; + level = value; + return this; + } + + /** + * optional uint32 rank = 10; + * @return whether the rank field is set + */ + public boolean hasRank() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 rank = 10; + * @return this + */ + public DisplayAvatarDetailInfo clearRank() { + bitField0_ &= ~0x00000010; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 10; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 10; + * @param value the rank to set + * @return this + */ + public DisplayAvatarDetailInfo setRank(final int value) { + bitField0_ |= 0x00000010; + rank = value; + return this; + } + + /** + * optional uint32 exp = 12; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 exp = 12; + * @return this + */ + public DisplayAvatarDetailInfo clearExp() { + bitField0_ &= ~0x00000020; + 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 DisplayAvatarDetailInfo setExp(final int value) { + bitField0_ |= 0x00000020; + exp = value; + return this; + } + + /** + * optional uint32 dressed_skin_id = 14; + * @return whether the dressedSkinId field is set + */ + public boolean hasDressedSkinId() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 dressed_skin_id = 14; + * @return this + */ + public DisplayAvatarDetailInfo clearDressedSkinId() { + bitField0_ &= ~0x00000040; + dressedSkinId = 0; + return this; + } + + /** + * optional uint32 dressed_skin_id = 14; + * @return the dressedSkinId + */ + public int getDressedSkinId() { + return dressedSkinId; + } + + /** + * optional uint32 dressed_skin_id = 14; + * @param value the dressedSkinId to set + * @return this + */ + public DisplayAvatarDetailInfo setDressedSkinId(final int value) { + bitField0_ |= 0x00000040; + dressedSkinId = value; + return this; + } + + /** + * optional .DisplayEquipmentInfo equipment = 15; * @return whether the equipment field is set */ public boolean hasEquipment() { @@ -358,7 +366,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 5; + * optional .DisplayEquipmentInfo equipment = 15; * @return this */ public DisplayAvatarDetailInfo clearEquipment() { @@ -368,7 +376,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 5; + * optional .DisplayEquipmentInfo equipment = 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. @@ -382,7 +390,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 5; + * optional .DisplayEquipmentInfo equipment = 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 @@ -396,7 +404,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 5; + * optional .DisplayEquipmentInfo equipment = 15; * @param value the equipment to set * @return this */ @@ -408,7 +416,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated uint32 all_path_unlocked_special_point_id_list = 999; * @return whether the allPathUnlockedSpecialPointIdList field is set */ public boolean hasAllPathUnlockedSpecialPointIdList() { @@ -416,7 +428,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated uint32 all_path_unlocked_special_point_id_list = 999; * @return this */ public DisplayAvatarDetailInfo clearAllPathUnlockedSpecialPointIdList() { @@ -426,7 +442,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated uint32 all_path_unlocked_special_point_id_list = 999; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -440,7 +460,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated uint32 all_path_unlocked_special_point_id_list = 999; * * 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,7 +478,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated uint32 all_path_unlocked_special_point_id_list = 999; * @param value the allPathUnlockedSpecialPointIdList to add * @return this */ @@ -465,7 +493,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated uint32 all_path_unlocked_special_point_id_list = 999; * @param values the allPathUnlockedSpecialPointIdList to add * @return this */ @@ -476,7 +508,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 2; + * repeated .AvatarSkillTree skilltree_list = 7; * @return whether the skilltreeList field is set */ public boolean hasSkilltreeList() { @@ -484,7 +516,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 2; + * repeated .AvatarSkillTree skilltree_list = 7; * @return this */ public DisplayAvatarDetailInfo clearSkilltreeList() { @@ -494,7 +526,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 2; + * repeated .AvatarSkillTree skilltree_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. @@ -508,7 +540,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 2; + * repeated .AvatarSkillTree skilltree_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 @@ -522,7 +554,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 2; + * repeated .AvatarSkillTree skilltree_list = 7; * @param value the skilltreeList to add * @return this */ @@ -534,7 +566,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 2; + * repeated .AvatarSkillTree skilltree_list = 7; * @param values the skilltreeList to add * @return this */ @@ -546,25 +578,107 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; - * @return whether the allPathSpecialSkilltreeList field is set + * repeated .DisplayRelicInfo relic_list = 13; + * @return whether the relicList field is set */ - public boolean hasAllPathSpecialSkilltreeList() { + public boolean hasRelicList() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * repeated .DisplayRelicInfo relic_list = 13; + * @return this + */ + public DisplayAvatarDetailInfo clearRelicList() { + bitField0_ &= ~0x00000400; + relicList.clear(); + return this; + } + + /** + * repeated .DisplayRelicInfo 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 #getMutableRelicList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getRelicList() { + return relicList; + } + + /** + * repeated .DisplayRelicInfo relic_list = 13; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableRelicList() { + bitField0_ |= 0x00000400; + return relicList; + } + + /** + * repeated .DisplayRelicInfo relic_list = 13; + * @param value the relicList to add + * @return this + */ + public DisplayAvatarDetailInfo addRelicList( + final DisplayRelicInfoOuterClass.DisplayRelicInfo value) { + bitField0_ |= 0x00000400; + relicList.add(value); + return this; + } + + /** + * repeated .DisplayRelicInfo relic_list = 13; + * @param values the relicList to add + * @return this + */ + public DisplayAvatarDetailInfo addAllRelicList( + final DisplayRelicInfoOuterClass.DisplayRelicInfo... values) { + bitField0_ |= 0x00000400; + relicList.addAll(values); + return this; + } + + /** + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated .AvatarSkillTree all_path_special_skilltree_list = 9999; + * @return whether the allPathSpecialSkilltreeList field is set + */ + public boolean hasAllPathSpecialSkilltreeList() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated .AvatarSkillTree all_path_special_skilltree_list = 9999; * @return this */ public DisplayAvatarDetailInfo clearAllPathSpecialSkilltreeList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000800; allPathSpecialSkilltreeList.clear(); return this; } /** - * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated .AvatarSkillTree all_path_special_skilltree_list = 9999; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -579,7 +693,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated .AvatarSkillTree all_path_special_skilltree_list = 9999; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -589,121 +707,59 @@ public final class DisplayAvatarDetailInfoOuterClass { */ public RepeatedMessage getMutableAllPathSpecialSkilltreeList( ) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; return allPathSpecialSkilltreeList; } /** - * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated .AvatarSkillTree all_path_special_skilltree_list = 9999; * @param value the allPathSpecialSkilltreeList to add * @return this */ public DisplayAvatarDetailInfo addAllPathSpecialSkilltreeList( final AvatarSkillTreeOuterClass.AvatarSkillTree value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; allPathSpecialSkilltreeList.add(value); return this; } /** - * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * 
+     *  doesnt exist anymore???
+     *
+ * + * repeated .AvatarSkillTree all_path_special_skilltree_list = 9999; * @param values the allPathSpecialSkilltreeList to add * @return this */ public DisplayAvatarDetailInfo addAllAllPathSpecialSkilltreeList( final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; allPathSpecialSkilltreeList.addAll(values); return this; } - /** - * repeated .DisplayRelicInfo relic_list = 11; - * @return whether the relicList field is set - */ - public boolean hasRelicList() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * repeated .DisplayRelicInfo relic_list = 11; - * @return this - */ - public DisplayAvatarDetailInfo clearRelicList() { - bitField0_ &= ~0x00000800; - relicList.clear(); - return this; - } - - /** - * repeated .DisplayRelicInfo relic_list = 11; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRelicList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getRelicList() { - return relicList; - } - - /** - * repeated .DisplayRelicInfo relic_list = 11; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000800; - return relicList; - } - - /** - * repeated .DisplayRelicInfo relic_list = 11; - * @param value the relicList to add - * @return this - */ - public DisplayAvatarDetailInfo addRelicList( - final DisplayRelicInfoOuterClass.DisplayRelicInfo value) { - bitField0_ |= 0x00000800; - relicList.add(value); - return this; - } - - /** - * repeated .DisplayRelicInfo relic_list = 11; - * @param values the relicList to add - * @return this - */ - public DisplayAvatarDetailInfo addAllRelicList( - final DisplayRelicInfoOuterClass.DisplayRelicInfo... values) { - bitField0_ |= 0x00000800; - relicList.addAll(values); - return this; - } - @Override public DisplayAvatarDetailInfo copyFrom(final DisplayAvatarDetailInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dressedSkinId = other.dressedSkinId; - rank = other.rank; - exp = other.exp; avatarId = other.avatarId; - level = other.level; pos = other.pos; promotion = other.promotion; + level = other.level; + rank = other.rank; + exp = other.exp; + dressedSkinId = other.dressedSkinId; equipment.copyFrom(other.equipment); allPathUnlockedSpecialPointIdList.copyFrom(other.allPathUnlockedSpecialPointIdList); skilltreeList.copyFrom(other.skilltreeList); - allPathSpecialSkilltreeList.copyFrom(other.allPathSpecialSkilltreeList); relicList.copyFrom(other.relicList); + allPathSpecialSkilltreeList.copyFrom(other.allPathSpecialSkilltreeList); } return this; } @@ -714,8 +770,17 @@ public final class DisplayAvatarDetailInfoOuterClass { return this; } cachedSize = -1; - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } + if (other.hasPos()) { + setPos(other.pos); + } + if (other.hasPromotion()) { + setPromotion(other.promotion); + } + if (other.hasLevel()) { + setLevel(other.level); } if (other.hasRank()) { setRank(other.rank); @@ -723,17 +788,8 @@ public final class DisplayAvatarDetailInfoOuterClass { if (other.hasExp()) { setExp(other.exp); } - if (other.hasAvatarId()) { - setAvatarId(other.avatarId); - } - if (other.hasLevel()) { - setLevel(other.level); - } - if (other.hasPos()) { - setPos(other.pos); - } - if (other.hasPromotion()) { - setPromotion(other.promotion); + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); } if (other.hasEquipment()) { getMutableEquipment().mergeFrom(other.equipment); @@ -744,12 +800,12 @@ public final class DisplayAvatarDetailInfoOuterClass { if (other.hasSkilltreeList()) { getMutableSkilltreeList().addAll(other.skilltreeList); } - if (other.hasAllPathSpecialSkilltreeList()) { - getMutableAllPathSpecialSkilltreeList().addAll(other.allPathSpecialSkilltreeList); - } if (other.hasRelicList()) { getMutableRelicList().addAll(other.relicList); } + if (other.hasAllPathSpecialSkilltreeList()) { + getMutableAllPathSpecialSkilltreeList().addAll(other.allPathSpecialSkilltreeList); + } return this; } @@ -760,18 +816,18 @@ public final class DisplayAvatarDetailInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - dressedSkinId = 0; - rank = 0; - exp = 0; avatarId = 0; - level = 0; pos = 0; promotion = 0; + level = 0; + rank = 0; + exp = 0; + dressedSkinId = 0; equipment.clear(); allPathUnlockedSpecialPointIdList.clear(); skilltreeList.clear(); - allPathSpecialSkilltreeList.clear(); relicList.clear(); + allPathSpecialSkilltreeList.clear(); return this; } @@ -785,8 +841,8 @@ public final class DisplayAvatarDetailInfoOuterClass { equipment.clearQuick(); allPathUnlockedSpecialPointIdList.clear(); skilltreeList.clearQuick(); - allPathSpecialSkilltreeList.clearQuick(); relicList.clearQuick(); + allPathSpecialSkilltreeList.clearQuick(); return this; } @@ -800,76 +856,77 @@ public final class DisplayAvatarDetailInfoOuterClass { } DisplayAvatarDetailInfo other = (DisplayAvatarDetailInfo) o; return bitField0_ == other.bitField0_ - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) - && (!hasRank() || rank == other.rank) - && (!hasExp() || exp == other.exp) && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasLevel() || level == other.level) && (!hasPos() || pos == other.pos) && (!hasPromotion() || promotion == other.promotion) + && (!hasLevel() || level == other.level) + && (!hasRank() || rank == other.rank) + && (!hasExp() || exp == other.exp) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasEquipment() || equipment.equals(other.equipment)) && (!hasAllPathUnlockedSpecialPointIdList() || allPathUnlockedSpecialPointIdList.equals(other.allPathUnlockedSpecialPointIdList)) && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)) - && (!hasAllPathSpecialSkilltreeList() || allPathSpecialSkilltreeList.equals(other.allPathSpecialSkilltreeList)) - && (!hasRelicList() || relicList.equals(other.relicList)); + && (!hasRelicList() || relicList.equals(other.relicList)) + && (!hasAllPathSpecialSkilltreeList() || allPathSpecialSkilltreeList.equals(other.allPathSpecialSkilltreeList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(dressedSkinId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(level); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(pos); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(promotion); + output.writeUInt32NoTag(dressedSkinId); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 122); output.writeMessageNoTag(equipment); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < allPathUnlockedSpecialPointIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawLittleEndian16((short) 16056); output.writeUInt32NoTag(allPathUnlockedSpecialPointIdList.array()[i]); } } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 58); output.writeMessageNoTag(skilltreeList.get(i)); } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < allPathSpecialSkilltreeList.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(allPathSpecialSkilltreeList.get(i)); + for (int i = 0; i < relicList.length(); i++) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(relicList.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < allPathSpecialSkilltreeList.length(); i++) { + output.writeRawLittleEndian16((short) 61690); + output.writeRawByte((byte) 4); + output.writeMessageNoTag(allPathSpecialSkilltreeList.get(i)); } } } @@ -878,40 +935,40 @@ public final class DisplayAvatarDetailInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(equipment); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * allPathUnlockedSpecialPointIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(allPathUnlockedSpecialPointIdList); + size += (2 * allPathUnlockedSpecialPointIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(allPathUnlockedSpecialPointIdList); } if ((bitField0_ & 0x00000200) != 0) { size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); } if ((bitField0_ & 0x00000400) != 0) { - size += (1 * allPathSpecialSkilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(allPathSpecialSkilltreeList); + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } if ((bitField0_ & 0x00000800) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (3 * allPathSpecialSkilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(allPathSpecialSkilltreeList); } return size; } @@ -923,36 +980,36 @@ public final class DisplayAvatarDetailInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // dressedSkinId - dressedSkinId = input.readUInt32(); + case 8: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 40) { break; } } - case 56: { - // rank - rank = input.readUInt32(); + case 40: { + // pos + pos = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // promotion + promotion = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 64) { break; } } case 64: { - // exp - exp = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // avatarId - avatarId = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 80) { @@ -960,8 +1017,8 @@ public final class DisplayAvatarDetailInfoOuterClass { } } case 80: { - // level - level = input.readUInt32(); + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 96) { @@ -969,8 +1026,8 @@ public final class DisplayAvatarDetailInfoOuterClass { } } case 96: { - // pos - pos = input.readUInt32(); + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 112) { @@ -978,51 +1035,51 @@ public final class DisplayAvatarDetailInfoOuterClass { } } case 112: { - // promotion - promotion = input.readUInt32(); + // dressedSkinId + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 42) { + if (tag != 122) { break; } } - case 42: { + case 122: { // equipment input.readMessage(equipment); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 10) { + if (tag != 7994) { break; } } - case 10: { + case 7994: { // allPathUnlockedSpecialPointIdList [packed=true] input.readPackedUInt32(allPathUnlockedSpecialPointIdList, tag); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 18) { + if (tag != 58) { break; } } - case 18: { + case 58: { // skilltreeList tag = input.readRepeatedMessage(skilltreeList, tag); bitField0_ |= 0x00000200; - if (tag != 26) { + if (tag != 106) { break; } } - case 26: { - // allPathSpecialSkilltreeList - tag = input.readRepeatedMessage(allPathSpecialSkilltreeList, tag); - bitField0_ |= 0x00000400; - if (tag != 90) { - break; - } - } - case 90: { + case 106: { // relicList tag = input.readRepeatedMessage(relicList, tag); + bitField0_ |= 0x00000400; + if (tag != 79994) { + break; + } + } + case 79994: { + // allPathSpecialSkilltreeList + tag = input.readRepeatedMessage(allPathSpecialSkilltreeList, tag); bitField0_ |= 0x00000800; if (tag != 0) { break; @@ -1038,7 +1095,7 @@ public final class DisplayAvatarDetailInfoOuterClass { tag = input.readTag(); break; } - case 8: { + case 7992: { // allPathUnlockedSpecialPointIdList [packed=false] tag = input.readRepeatedUInt32(allPathUnlockedSpecialPointIdList, tag); bitField0_ |= 0x00000100; @@ -1052,26 +1109,26 @@ public final class DisplayAvatarDetailInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.rank, rank); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.exp, exp); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.avatarId, avatarId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.pos, pos); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.promotion, promotion); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.level, level); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.rank, rank); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.equipment, equipment); } @@ -1082,10 +1139,10 @@ public final class DisplayAvatarDetailInfoOuterClass { output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.allPathSpecialSkilltreeList, allPathSpecialSkilltreeList); + output.writeRepeatedMessage(FieldNames.relicList, relicList); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedMessage(FieldNames.allPathSpecialSkilltreeList, allPathSpecialSkilltreeList); } output.endObject(); } @@ -1097,57 +1154,12 @@ public final class DisplayAvatarDetailInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -407000018: - case 2012697844: { - if (input.isAtField(FieldNames.dressedSkinId)) { - if (!input.trySkipNullValue()) { - dressedSkinId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { - if (!input.trySkipNullValue()) { - rank = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 100893: { - if (input.isAtField(FieldNames.exp)) { - if (!input.trySkipNullValue()) { - exp = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 1787287636: case -428636735: { if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { avatarId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -1158,7 +1170,7 @@ public final class DisplayAvatarDetailInfoOuterClass { if (input.isAtField(FieldNames.pos)) { if (!input.trySkipNullValue()) { pos = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -1169,6 +1181,51 @@ public final class DisplayAvatarDetailInfoOuterClass { if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { promotion = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3492908: { + if (input.isAtField(FieldNames.rank)) { + if (!input.trySkipNullValue()) { + rank = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100893: { + if (input.isAtField(FieldNames.exp)) { + if (!input.trySkipNullValue()) { + exp = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case -407000018: + case 2012697844: { + if (input.isAtField(FieldNames.dressedSkinId)) { + if (!input.trySkipNullValue()) { + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -1211,11 +1268,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } break; } - case 1838433530: - case 1435588976: { - if (input.isAtField(FieldNames.allPathSpecialSkilltreeList)) { + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(allPathSpecialSkilltreeList); + input.readRepeatedMessage(relicList); bitField0_ |= 0x00000400; } } else { @@ -1223,11 +1280,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { + case 1838433530: + case 1435588976: { + if (input.isAtField(FieldNames.allPathSpecialSkilltreeList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); + input.readRepeatedMessage(allPathSpecialSkilltreeList); bitField0_ |= 0x00000800; } } else { @@ -1288,19 +1345,19 @@ public final class DisplayAvatarDetailInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - 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 promotion = FieldName.forField("promotion"); + + static final FieldName level = FieldName.forField("level"); static final FieldName rank = FieldName.forField("rank"); static final FieldName exp = FieldName.forField("exp"); - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - - static final FieldName level = FieldName.forField("level"); - - static final FieldName pos = FieldName.forField("pos"); - - static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); static final FieldName equipment = FieldName.forField("equipment"); @@ -1308,9 +1365,9 @@ public final class DisplayAvatarDetailInfoOuterClass { static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); - static final FieldName allPathSpecialSkilltreeList = FieldName.forField("allPathSpecialSkilltreeList", "all_path_special_skilltree_list"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); + + static final FieldName allPathSpecialSkilltreeList = FieldName.forField("allPathSpecialSkilltreeList", "all_path_special_skilltree_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java index f7f0a80..f2af56d 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java @@ -19,15 +19,15 @@ public final class DisplayAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 pos = 2; - */ - private int pos; - - /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 11; */ private int avatarId; + /** + * optional uint32 pos = 13; + */ + private int pos; + private DisplayAvatar() { } @@ -39,62 +39,25 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 2; - * @return whether the pos field is set + * optional uint32 avatar_id = 11; + * @return whether the avatarId field is set */ - public boolean hasPos() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 pos = 2; - * @return this - */ - public DisplayAvatar clearPos() { - bitField0_ &= ~0x00000001; - pos = 0; - return this; - } - - /** - * optional uint32 pos = 2; - * @return the pos - */ - public int getPos() { - return pos; - } - - /** - * optional uint32 pos = 2; - * @param value the pos to set - * @return this - */ - public DisplayAvatar setPos(final int value) { - bitField0_ |= 0x00000001; - pos = value; - return this; - } - - /** - * optional uint32 avatar_id = 13; - * @return whether the avatarId field is set - */ - public boolean hasAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 11; * @return this */ public DisplayAvatar clearAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 11; * @return the avatarId */ public int getAvatarId() { @@ -102,23 +65,60 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 11; * @param value the avatarId to set * @return this */ public DisplayAvatar setAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; avatarId = value; return this; } + /** + * optional uint32 pos = 13; + * @return whether the pos field is set + */ + public boolean hasPos() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 pos = 13; + * @return this + */ + public DisplayAvatar clearPos() { + bitField0_ &= ~0x00000002; + pos = 0; + return this; + } + + /** + * optional uint32 pos = 13; + * @return the pos + */ + public int getPos() { + return pos; + } + + /** + * optional uint32 pos = 13; + * @param value the pos to set + * @return this + */ + public DisplayAvatar setPos(final int value) { + bitField0_ |= 0x00000002; + pos = value; + return this; + } + @Override public DisplayAvatar copyFrom(final DisplayAvatar other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - pos = other.pos; avatarId = other.avatarId; + pos = other.pos; } return this; } @@ -129,12 +129,12 @@ public final class DisplayAvatarOuterClass { return this; } cachedSize = -1; - if (other.hasPos()) { - setPos(other.pos); - } if (other.hasAvatarId()) { setAvatarId(other.avatarId); } + if (other.hasPos()) { + setPos(other.pos); + } return this; } @@ -145,8 +145,8 @@ public final class DisplayAvatarOuterClass { } cachedSize = -1; bitField0_ = 0; - pos = 0; avatarId = 0; + pos = 0; return this; } @@ -170,19 +170,19 @@ public final class DisplayAvatarOuterClass { } DisplayAvatar other = (DisplayAvatar) o; return bitField0_ == other.bitField0_ - && (!hasPos() || pos == other.pos) - && (!hasAvatarId() || avatarId == other.avatarId); + && (!hasAvatarId() || avatarId == other.avatarId) + && (!hasPos() || pos == other.pos); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(pos); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(avatarId); + output.writeUInt32NoTag(pos); } } @@ -190,10 +190,10 @@ public final class DisplayAvatarOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } return size; } @@ -205,9 +205,9 @@ public final class DisplayAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // pos - pos = input.readUInt32(); + case 88: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 104) { @@ -215,8 +215,8 @@ public final class DisplayAvatarOuterClass { } } case 104: { - // avatarId - avatarId = input.readUInt32(); + // pos + pos = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class DisplayAvatarOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.pos, pos); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.pos, pos); } output.endObject(); } @@ -256,10 +256,11 @@ public final class DisplayAvatarOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 111188: { - if (input.isAtField(FieldNames.pos)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - pos = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class DisplayAvatarOuterClass { } break; } - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { + case 111188: { + if (input.isAtField(FieldNames.pos)) { if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); + pos = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class DisplayAvatarOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName pos = FieldName.forField("pos"); - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + + static final FieldName pos = FieldName.forField("pos"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java index 6696663..0638e14 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 = 13; + * optional bool is_display = 8; */ private boolean isDisplay; /** - * repeated .DisplayAvatar display_avatar_list = 8; + * repeated .DisplayAvatar display_avatar_list = 13; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -40,7 +40,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 13; + * optional bool is_display = 8; * @return whether the isDisplay field is set */ public boolean hasIsDisplay() { @@ -48,7 +48,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 13; + * optional bool is_display = 8; * @return this */ public DisplayAvatarVec clearIsDisplay() { @@ -58,7 +58,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 13; + * optional bool is_display = 8; * @return the isDisplay */ public boolean getIsDisplay() { @@ -66,7 +66,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 13; + * optional bool is_display = 8; * @param value the isDisplay to set * @return this */ @@ -77,7 +77,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 8; + * repeated .DisplayAvatar display_avatar_list = 13; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -85,7 +85,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 8; + * repeated .DisplayAvatar display_avatar_list = 13; * @return this */ public DisplayAvatarVec clearDisplayAvatarList() { @@ -95,7 +95,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 8; + * repeated .DisplayAvatar display_avatar_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 8; + * repeated .DisplayAvatar display_avatar_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 8; + * repeated .DisplayAvatar display_avatar_list = 13; * @param value the displayAvatarList to add * @return this */ @@ -135,7 +135,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 8; + * repeated .DisplayAvatar display_avatar_list = 13; * @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) 104); + output.writeRawByte((byte) 64); output.writeBoolNoTag(isDisplay); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 106); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -242,16 +242,16 @@ public final class DisplayAvatarVecOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 64: { // isDisplay isDisplay = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 106) { break; } } - case 66: { + case 106: { // 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 5697f33..6fcbb7a 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 rank = 1; - */ - private int rank; - - /** - * optional uint32 exp = 3; + * optional uint32 exp = 2; */ private int exp; /** - * optional uint32 promotion = 5; + * optional uint32 rank = 4; */ - private int promotion; + private int rank; /** - * optional uint32 level = 7; + * optional uint32 level = 5; */ private int level; /** - * optional uint32 tid = 11; + * optional uint32 tid = 12; */ private int tid; + /** + * optional uint32 promotion = 15; + */ + private int promotion; + private DisplayEquipmentInfo() { } @@ -54,62 +54,25 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 rank = 1; - * @return whether the rank field is set + * optional uint32 exp = 2; + * @return whether the exp field is set */ - public boolean hasRank() { + public boolean hasExp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rank = 1; - * @return this - */ - public DisplayEquipmentInfo clearRank() { - bitField0_ &= ~0x00000001; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 1; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 1; - * @param value the rank to set - * @return this - */ - public DisplayEquipmentInfo setRank(final int value) { - bitField0_ |= 0x00000001; - rank = value; - return this; - } - - /** - * optional uint32 exp = 3; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 exp = 3; + * optional uint32 exp = 2; * @return this */ public DisplayEquipmentInfo clearExp() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; exp = 0; return this; } /** - * optional uint32 exp = 3; + * optional uint32 exp = 2; * @return the exp */ public int getExp() { @@ -117,73 +80,73 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 exp = 3; + * optional uint32 exp = 2; * @param value the exp to set * @return this */ public DisplayEquipmentInfo setExp(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; exp = value; return this; } /** - * optional uint32 promotion = 5; - * @return whether the promotion field is set + * optional uint32 rank = 4; + * @return whether the rank field is set */ - public boolean hasPromotion() { + public boolean hasRank() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 rank = 4; + * @return this + */ + public DisplayEquipmentInfo clearRank() { + bitField0_ &= ~0x00000002; + 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 DisplayEquipmentInfo setRank(final int value) { + bitField0_ |= 0x00000002; + rank = value; + return this; + } + + /** + * optional uint32 level = 5; + * @return whether the level field is set + */ + public boolean hasLevel() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 promotion = 5; - * @return this - */ - public DisplayEquipmentInfo clearPromotion() { - bitField0_ &= ~0x00000004; - promotion = 0; - return this; - } - - /** - * optional uint32 promotion = 5; - * @return the promotion - */ - public int getPromotion() { - return promotion; - } - - /** - * optional uint32 promotion = 5; - * @param value the promotion to set - * @return this - */ - public DisplayEquipmentInfo setPromotion(final int value) { - bitField0_ |= 0x00000004; - promotion = value; - return this; - } - - /** - * optional uint32 level = 7; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 level = 7; + * optional uint32 level = 5; * @return this */ public DisplayEquipmentInfo clearLevel() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; level = 0; return this; } /** - * optional uint32 level = 7; + * optional uint32 level = 5; * @return the level */ public int getLevel() { @@ -191,36 +154,36 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 level = 7; + * optional uint32 level = 5; * @param value the level to set * @return this */ public DisplayEquipmentInfo setLevel(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; level = value; return this; } /** - * optional uint32 tid = 11; + * optional uint32 tid = 12; * @return whether the tid field is set */ public boolean hasTid() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 tid = 11; + * optional uint32 tid = 12; * @return this */ public DisplayEquipmentInfo clearTid() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; tid = 0; return this; } /** - * optional uint32 tid = 11; + * optional uint32 tid = 12; * @return the tid */ public int getTid() { @@ -228,26 +191,63 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 tid = 11; + * optional uint32 tid = 12; * @param value the tid to set * @return this */ public DisplayEquipmentInfo setTid(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tid = value; return this; } + /** + * optional uint32 promotion = 15; + * @return whether the promotion field is set + */ + public boolean hasPromotion() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 promotion = 15; + * @return this + */ + public DisplayEquipmentInfo clearPromotion() { + bitField0_ &= ~0x00000010; + promotion = 0; + return this; + } + + /** + * optional uint32 promotion = 15; + * @return the promotion + */ + public int getPromotion() { + return promotion; + } + + /** + * optional uint32 promotion = 15; + * @param value the promotion to set + * @return this + */ + public DisplayEquipmentInfo setPromotion(final int value) { + bitField0_ |= 0x00000010; + promotion = value; + return this; + } + @Override public DisplayEquipmentInfo copyFrom(final DisplayEquipmentInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rank = other.rank; exp = other.exp; - promotion = other.promotion; + rank = other.rank; level = other.level; tid = other.tid; + promotion = other.promotion; } return this; } @@ -258,14 +258,11 @@ public final class DisplayEquipmentInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRank()) { - setRank(other.rank); - } if (other.hasExp()) { setExp(other.exp); } - if (other.hasPromotion()) { - setPromotion(other.promotion); + if (other.hasRank()) { + setRank(other.rank); } if (other.hasLevel()) { setLevel(other.level); @@ -273,6 +270,9 @@ public final class DisplayEquipmentInfoOuterClass { if (other.hasTid()) { setTid(other.tid); } + if (other.hasPromotion()) { + setPromotion(other.promotion); + } return this; } @@ -283,11 +283,11 @@ public final class DisplayEquipmentInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rank = 0; exp = 0; - promotion = 0; + rank = 0; level = 0; tid = 0; + promotion = 0; return this; } @@ -311,55 +311,55 @@ public final class DisplayEquipmentInfoOuterClass { } DisplayEquipmentInfo other = (DisplayEquipmentInfo) o; return bitField0_ == other.bitField0_ - && (!hasRank() || rank == other.rank) && (!hasExp() || exp == other.exp) - && (!hasPromotion() || promotion == other.promotion) + && (!hasRank() || rank == other.rank) && (!hasLevel() || level == other.level) - && (!hasTid() || tid == other.tid); + && (!hasTid() || tid == other.tid) + && (!hasPromotion() || promotion == other.promotion); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(promotion); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); output.writeUInt32NoTag(level); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 96); output.writeUInt32NoTag(tid); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(promotion); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + } return size; } @@ -370,18 +370,18 @@ public final class DisplayEquipmentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // rank - rank = input.readUInt32(); + case 16: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 32) { break; } } - case 24: { - // exp - exp = input.readUInt32(); + case 32: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 40) { @@ -389,26 +389,26 @@ public final class DisplayEquipmentInfoOuterClass { } } case 40: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { // level level = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { + case 96: { // tid tid = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -433,20 +433,20 @@ public final class DisplayEquipmentInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rank, rank); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.exp, exp); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.rank, rank); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.level, level); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.tid, tid); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.promotion, promotion); + } output.endObject(); } @@ -457,10 +457,10 @@ public final class DisplayEquipmentInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -468,10 +468,10 @@ public final class DisplayEquipmentInfoOuterClass { } break; } - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -479,22 +479,11 @@ public final class DisplayEquipmentInfoOuterClass { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -505,6 +494,17 @@ public final class DisplayEquipmentInfoOuterClass { if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { tid = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { + if (!input.trySkipNullValue()) { + promotion = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -565,15 +565,15 @@ public final class DisplayEquipmentInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rank = FieldName.forField("rank"); - static final FieldName exp = FieldName.forField("exp"); - static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName rank = FieldName.forField("rank"); static final FieldName level = FieldName.forField("level"); static final FieldName tid = FieldName.forField("tid"); + + static final FieldName promotion = FieldName.forField("promotion"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DisplayRecordTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayRecordTypeOuterClass.java index eaa6c8f..08f4731 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayRecordTypeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayRecordTypeOuterClass.java @@ -67,7 +67,7 @@ public final class DisplayRecordTypeOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return DisplayRecordTypeConverter.INSTANCE; } @@ -89,7 +89,7 @@ public final class DisplayRecordTypeOuterClass { return value == null ? other : value; } - enum DisplayRecordTypeConverter implements EnumConverter { + enum DisplayRecordTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final DisplayRecordType[] lookup = new DisplayRecordType[3]; diff --git a/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java index 2958ff3..2ee55f2 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java @@ -20,32 +20,32 @@ public final class DisplayRelicInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 5; + * optional uint32 slot = 2; */ private int slot; /** - * optional uint32 tid = 8; - */ - private int tid; - - /** - * optional uint32 level = 12; + * optional uint32 level = 6; */ private int level; /** - * optional uint32 exp = 13; + * optional uint32 exp = 9; */ private int exp; /** - * optional uint32 main_affix_id = 15; + * optional uint32 main_affix_id = 11; */ private int mainAffixId; /** - * repeated .RelicAffix sub_affix_list = 10; + * optional uint32 tid = 13; + */ + private int tid; + + /** + * repeated .RelicAffix sub_affix_list = 15; */ private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory()); @@ -60,7 +60,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 slot = 5; + * optional uint32 slot = 2; * @return whether the slot field is set */ public boolean hasSlot() { @@ -68,7 +68,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 slot = 5; + * optional uint32 slot = 2; * @return this */ public DisplayRelicInfo clearSlot() { @@ -78,7 +78,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 slot = 5; + * optional uint32 slot = 2; * @return the slot */ public int getSlot() { @@ -86,7 +86,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 slot = 5; + * optional uint32 slot = 2; * @param value the slot to set * @return this */ @@ -97,62 +97,25 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 tid = 8; - * @return whether the tid field is set + * optional uint32 level = 6; + * @return whether the level field is set */ - public boolean hasTid() { + public boolean hasLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 tid = 8; - * @return this - */ - public DisplayRelicInfo clearTid() { - bitField0_ &= ~0x00000002; - 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 DisplayRelicInfo setTid(final int value) { - bitField0_ |= 0x00000002; - tid = value; - return this; - } - - /** - * optional uint32 level = 12; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 level = 12; + * optional uint32 level = 6; * @return this */ public DisplayRelicInfo clearLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; level = 0; return this; } /** - * optional uint32 level = 12; + * optional uint32 level = 6; * @return the level */ public int getLevel() { @@ -160,36 +123,36 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 6; * @param value the level to set * @return this */ public DisplayRelicInfo setLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; level = value; return this; } /** - * optional uint32 exp = 13; + * optional uint32 exp = 9; * @return whether the exp field is set */ public boolean hasExp() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 exp = 13; + * optional uint32 exp = 9; * @return this */ public DisplayRelicInfo clearExp() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; exp = 0; return this; } /** - * optional uint32 exp = 13; + * optional uint32 exp = 9; * @return the exp */ public int getExp() { @@ -197,36 +160,36 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 exp = 13; + * optional uint32 exp = 9; * @param value the exp to set * @return this */ public DisplayRelicInfo setExp(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; exp = value; return this; } /** - * optional uint32 main_affix_id = 15; + * optional uint32 main_affix_id = 11; * @return whether the mainAffixId field is set */ public boolean hasMainAffixId() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 main_affix_id = 15; + * optional uint32 main_affix_id = 11; * @return this */ public DisplayRelicInfo clearMainAffixId() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; mainAffixId = 0; return this; } /** - * optional uint32 main_affix_id = 15; + * optional uint32 main_affix_id = 11; * @return the mainAffixId */ public int getMainAffixId() { @@ -234,18 +197,55 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 main_affix_id = 15; + * optional uint32 main_affix_id = 11; * @param value the mainAffixId to set * @return this */ public DisplayRelicInfo setMainAffixId(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; mainAffixId = value; return this; } /** - * repeated .RelicAffix sub_affix_list = 10; + * optional uint32 tid = 13; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 tid = 13; + * @return this + */ + public DisplayRelicInfo clearTid() { + bitField0_ &= ~0x00000010; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 13; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 13; + * @param value the tid to set + * @return this + */ + public DisplayRelicInfo setTid(final int value) { + bitField0_ |= 0x00000010; + tid = value; + return this; + } + + /** + * repeated .RelicAffix sub_affix_list = 15; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { @@ -253,7 +253,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 15; * @return this */ public DisplayRelicInfo clearSubAffixList() { @@ -263,7 +263,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_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. @@ -277,7 +277,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_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 @@ -291,7 +291,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 15; * @param value the subAffixList to add * @return this */ @@ -302,7 +302,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 10; + * repeated .RelicAffix sub_affix_list = 15; * @param values the subAffixList to add * @return this */ @@ -318,10 +318,10 @@ public final class DisplayRelicInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; slot = other.slot; - tid = other.tid; level = other.level; exp = other.exp; mainAffixId = other.mainAffixId; + tid = other.tid; subAffixList.copyFrom(other.subAffixList); } return this; @@ -336,9 +336,6 @@ public final class DisplayRelicInfoOuterClass { if (other.hasSlot()) { setSlot(other.slot); } - if (other.hasTid()) { - setTid(other.tid); - } if (other.hasLevel()) { setLevel(other.level); } @@ -348,6 +345,9 @@ public final class DisplayRelicInfoOuterClass { if (other.hasMainAffixId()) { setMainAffixId(other.mainAffixId); } + if (other.hasTid()) { + setTid(other.tid); + } if (other.hasSubAffixList()) { getMutableSubAffixList().addAll(other.subAffixList); } @@ -362,10 +362,10 @@ public final class DisplayRelicInfoOuterClass { cachedSize = -1; bitField0_ = 0; slot = 0; - tid = 0; level = 0; exp = 0; mainAffixId = 0; + tid = 0; subAffixList.clear(); return this; } @@ -392,38 +392,38 @@ public final class DisplayRelicInfoOuterClass { DisplayRelicInfo other = (DisplayRelicInfo) o; return bitField0_ == other.bitField0_ && (!hasSlot() || slot == other.slot) - && (!hasTid() || tid == other.tid) && (!hasLevel() || level == other.level) && (!hasExp() || exp == other.exp) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasTid() || tid == other.tid) && (!hasSubAffixList() || subAffixList.equals(other.subAffixList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(tid); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(level); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); output.writeUInt32NoTag(exp); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); output.writeUInt32NoTag(mainAffixId); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(tid); + } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < subAffixList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 122); output.writeMessageNoTag(subAffixList.get(i)); } } @@ -436,17 +436,17 @@ public final class DisplayRelicInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + } if ((bitField0_ & 0x00000020) != 0) { size += (1 * subAffixList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subAffixList); } @@ -460,52 +460,52 @@ public final class DisplayRelicInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { - // tid - tid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 48: { // level level = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // mainAffixId + mainAffixId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // exp - exp = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // mainAffixId - mainAffixId = input.readUInt32(); + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 82) { + if (tag != 122) { break; } } - case 82: { + case 122: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); bitField0_ |= 0x00000020; @@ -534,17 +534,17 @@ public final class DisplayRelicInfoOuterClass { output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.tid, tid); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.level, level); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.exp, exp); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.tid, tid); + } if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.subAffixList, subAffixList); } @@ -569,22 +569,11 @@ public final class DisplayRelicInfoOuterClass { } break; } - case 114831: { - if (input.isAtField(FieldNames.tid)) { - if (!input.trySkipNullValue()) { - tid = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -595,7 +584,7 @@ public final class DisplayRelicInfoOuterClass { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -607,6 +596,17 @@ public final class DisplayRelicInfoOuterClass { if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { mainAffixId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 114831: { + if (input.isAtField(FieldNames.tid)) { + if (!input.trySkipNullValue()) { + tid = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -681,14 +681,14 @@ public final class DisplayRelicInfoOuterClass { static class FieldNames { static final FieldName slot = FieldName.forField("slot"); - static final FieldName tid = FieldName.forField("tid"); - static final FieldName level = FieldName.forField("level"); static final FieldName exp = FieldName.forField("exp"); static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName tid = FieldName.forField("tid"); + 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 4a67f4b..374884d 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_num = 6; - */ - private int gachaNum; - - /** - * optional uint32 simulate_magic = 7; + * optional uint32 simulate_magic = 2; */ private int simulateMagic; /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_num = 8; */ - private int gachaId; + private int gachaNum; /** - * optional uint32 gacha_random = 14; + * optional uint32 gacha_random = 9; */ private int gachaRandom; + /** + * optional uint32 gacha_id = 14; + */ + private int gachaId; + private DoGachaCsReq() { } @@ -49,62 +49,25 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_num = 6; - * @return whether the gachaNum field is set + * optional uint32 simulate_magic = 2; + * @return whether the simulateMagic field is set */ - public boolean hasGachaNum() { + public boolean hasSimulateMagic() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_num = 6; - * @return this - */ - public DoGachaCsReq clearGachaNum() { - bitField0_ &= ~0x00000001; - gachaNum = 0; - return this; - } - - /** - * optional uint32 gacha_num = 6; - * @return the gachaNum - */ - public int getGachaNum() { - return gachaNum; - } - - /** - * optional uint32 gacha_num = 6; - * @param value the gachaNum to set - * @return this - */ - public DoGachaCsReq setGachaNum(final int value) { - bitField0_ |= 0x00000001; - gachaNum = value; - return this; - } - - /** - * optional uint32 simulate_magic = 7; - * @return whether the simulateMagic field is set - */ - public boolean hasSimulateMagic() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 simulate_magic = 7; + * optional uint32 simulate_magic = 2; * @return this */ public DoGachaCsReq clearSimulateMagic() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; simulateMagic = 0; return this; } /** - * optional uint32 simulate_magic = 7; + * optional uint32 simulate_magic = 2; * @return the simulateMagic */ public int getSimulateMagic() { @@ -112,73 +75,73 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 simulate_magic = 7; + * optional uint32 simulate_magic = 2; * @param value the simulateMagic to set * @return this */ public DoGachaCsReq setSimulateMagic(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; simulateMagic = value; return this; } /** - * optional uint32 gacha_id = 12; - * @return whether the gachaId field is set + * optional uint32 gacha_num = 8; + * @return whether the gachaNum field is set */ - public boolean hasGachaId() { + public boolean hasGachaNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 gacha_num = 8; + * @return this + */ + public DoGachaCsReq clearGachaNum() { + bitField0_ &= ~0x00000002; + gachaNum = 0; + return this; + } + + /** + * optional uint32 gacha_num = 8; + * @return the gachaNum + */ + public int getGachaNum() { + return gachaNum; + } + + /** + * optional uint32 gacha_num = 8; + * @param value the gachaNum to set + * @return this + */ + public DoGachaCsReq setGachaNum(final int value) { + bitField0_ |= 0x00000002; + gachaNum = value; + return this; + } + + /** + * optional uint32 gacha_random = 9; + * @return whether the gachaRandom field is set + */ + public boolean hasGachaRandom() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 gacha_id = 12; - * @return this - */ - public DoGachaCsReq clearGachaId() { - bitField0_ &= ~0x00000004; - gachaId = 0; - return this; - } - - /** - * optional uint32 gacha_id = 12; - * @return the gachaId - */ - public int getGachaId() { - return gachaId; - } - - /** - * optional uint32 gacha_id = 12; - * @param value the gachaId to set - * @return this - */ - public DoGachaCsReq setGachaId(final int value) { - bitField0_ |= 0x00000004; - gachaId = value; - return this; - } - - /** - * optional uint32 gacha_random = 14; - * @return whether the gachaRandom field is set - */ - public boolean hasGachaRandom() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 gacha_random = 14; + * optional uint32 gacha_random = 9; * @return this */ public DoGachaCsReq clearGachaRandom() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; gachaRandom = 0; return this; } /** - * optional uint32 gacha_random = 14; + * optional uint32 gacha_random = 9; * @return the gachaRandom */ public int getGachaRandom() { @@ -186,25 +149,62 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_random = 14; + * optional uint32 gacha_random = 9; * @param value the gachaRandom to set * @return this */ public DoGachaCsReq setGachaRandom(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; gachaRandom = value; return this; } + /** + * optional uint32 gacha_id = 14; + * @return whether the gachaId field is set + */ + public boolean hasGachaId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 gacha_id = 14; + * @return this + */ + public DoGachaCsReq clearGachaId() { + bitField0_ &= ~0x00000008; + gachaId = 0; + return this; + } + + /** + * optional uint32 gacha_id = 14; + * @return the gachaId + */ + public int getGachaId() { + return gachaId; + } + + /** + * optional uint32 gacha_id = 14; + * @param value the gachaId to set + * @return this + */ + public DoGachaCsReq setGachaId(final int value) { + bitField0_ |= 0x00000008; + gachaId = value; + return this; + } + @Override public DoGachaCsReq copyFrom(final DoGachaCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gachaNum = other.gachaNum; simulateMagic = other.simulateMagic; - gachaId = other.gachaId; + gachaNum = other.gachaNum; gachaRandom = other.gachaRandom; + gachaId = other.gachaId; } return this; } @@ -215,18 +215,18 @@ public final class DoGachaCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasGachaNum()) { - setGachaNum(other.gachaNum); - } if (other.hasSimulateMagic()) { setSimulateMagic(other.simulateMagic); } - if (other.hasGachaId()) { - setGachaId(other.gachaId); + if (other.hasGachaNum()) { + setGachaNum(other.gachaNum); } if (other.hasGachaRandom()) { setGachaRandom(other.gachaRandom); } + if (other.hasGachaId()) { + setGachaId(other.gachaId); + } return this; } @@ -237,10 +237,10 @@ public final class DoGachaCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - gachaNum = 0; simulateMagic = 0; - gachaId = 0; + gachaNum = 0; gachaRandom = 0; + gachaId = 0; return this; } @@ -264,29 +264,29 @@ public final class DoGachaCsReqOuterClass { } DoGachaCsReq other = (DoGachaCsReq) o; return bitField0_ == other.bitField0_ - && (!hasGachaNum() || gachaNum == other.gachaNum) && (!hasSimulateMagic() || simulateMagic == other.simulateMagic) - && (!hasGachaId() || gachaId == other.gachaId) - && (!hasGachaRandom() || gachaRandom == other.gachaRandom); + && (!hasGachaNum() || gachaNum == other.gachaNum) + && (!hasGachaRandom() || gachaRandom == other.gachaRandom) + && (!hasGachaId() || gachaId == other.gachaId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(gachaNum); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(simulateMagic); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(gachaNum); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(gachaId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(gachaRandom); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(gachaRandom); + output.writeUInt32NoTag(gachaId); } } @@ -294,16 +294,16 @@ public final class DoGachaCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } return size; } @@ -315,27 +315,27 @@ public final class DoGachaCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // gachaNum - gachaNum = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 16: { // simulateMagic simulateMagic = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 64) { break; } } - case 96: { - // gachaId - gachaId = input.readUInt32(); + case 64: { + // gachaNum + gachaNum = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // gachaRandom + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 112) { @@ -343,8 +343,8 @@ public final class DoGachaCsReqOuterClass { } } case 112: { - // gachaRandom - gachaRandom = input.readUInt32(); + // gachaId + gachaId = 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.gachaNum, gachaNum); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.simulateMagic, simulateMagic); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.gachaNum, gachaNum); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gachaId, gachaId); + output.writeUInt32(FieldNames.gachaRandom, gachaRandom); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); + output.writeUInt32(FieldNames.gachaId, gachaId); } output.endObject(); } @@ -390,11 +390,11 @@ public final class DoGachaCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2052317532: - case 803166025: { - if (input.isAtField(FieldNames.gachaNum)) { + case -370053655: + case 1939465170: { + if (input.isAtField(FieldNames.simulateMagic)) { if (!input.trySkipNullValue()) { - gachaNum = input.readUInt32(); + simulateMagic = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,11 +402,11 @@ public final class DoGachaCsReqOuterClass { } break; } - case -370053655: - case 1939465170: { - if (input.isAtField(FieldNames.simulateMagic)) { + case -2052317532: + case 803166025: { + if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { - simulateMagic = input.readUInt32(); + gachaNum = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -414,23 +414,23 @@ public final class DoGachaCsReqOuterClass { } break; } - case -204751299: - case -2052301576: { - if (input.isAtField(FieldNames.gachaId)) { - if (!input.trySkipNullValue()) { - gachaId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1635961627: case -47579616: { if (input.isAtField(FieldNames.gachaRandom)) { if (!input.trySkipNullValue()) { gachaRandom = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -204751299: + case -2052301576: { + if (input.isAtField(FieldNames.gachaId)) { + if (!input.trySkipNullValue()) { + gachaId = 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 gachaNum = FieldName.forField("gachaNum", "gacha_num"); - static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic"); - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); + static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); + + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java index c3307d2..8a57e7b 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java @@ -19,19 +19,19 @@ public final class DoGachaInRollShopCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 BBJIJINJAFK = 6; + * optional uint32 gacha_random = 5; */ - private int bBJIJINJAFK; + private int gachaRandom; /** - * optional uint32 roll_shop_id = 13; + * optional uint32 roll_shop_id = 11; */ private int rollShopId; /** - * optional uint32 gacha_random = 14; + * optional uint32 BBJIJINJAFK = 12; */ - private int gachaRandom; + private int bBJIJINJAFK; private DoGachaInRollShopCsReq() { } @@ -44,44 +44,44 @@ public final class DoGachaInRollShopCsReqOuterClass { } /** - * optional uint32 BBJIJINJAFK = 6; - * @return whether the bBJIJINJAFK field is set + * optional uint32 gacha_random = 5; + * @return whether the gachaRandom field is set */ - public boolean hasBBJIJINJAFK() { + public boolean hasGachaRandom() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 BBJIJINJAFK = 6; + * optional uint32 gacha_random = 5; * @return this */ - public DoGachaInRollShopCsReq clearBBJIJINJAFK() { + public DoGachaInRollShopCsReq clearGachaRandom() { bitField0_ &= ~0x00000001; - bBJIJINJAFK = 0; + gachaRandom = 0; return this; } /** - * optional uint32 BBJIJINJAFK = 6; - * @return the bBJIJINJAFK + * optional uint32 gacha_random = 5; + * @return the gachaRandom */ - public int getBBJIJINJAFK() { - return bBJIJINJAFK; + public int getGachaRandom() { + return gachaRandom; } /** - * optional uint32 BBJIJINJAFK = 6; - * @param value the bBJIJINJAFK to set + * optional uint32 gacha_random = 5; + * @param value the gachaRandom to set * @return this */ - public DoGachaInRollShopCsReq setBBJIJINJAFK(final int value) { + public DoGachaInRollShopCsReq setGachaRandom(final int value) { bitField0_ |= 0x00000001; - bBJIJINJAFK = value; + gachaRandom = value; return this; } /** - * optional uint32 roll_shop_id = 13; + * optional uint32 roll_shop_id = 11; * @return whether the rollShopId field is set */ public boolean hasRollShopId() { @@ -89,7 +89,7 @@ public final class DoGachaInRollShopCsReqOuterClass { } /** - * optional uint32 roll_shop_id = 13; + * optional uint32 roll_shop_id = 11; * @return this */ public DoGachaInRollShopCsReq clearRollShopId() { @@ -99,7 +99,7 @@ public final class DoGachaInRollShopCsReqOuterClass { } /** - * optional uint32 roll_shop_id = 13; + * optional uint32 roll_shop_id = 11; * @return the rollShopId */ public int getRollShopId() { @@ -107,7 +107,7 @@ public final class DoGachaInRollShopCsReqOuterClass { } /** - * optional uint32 roll_shop_id = 13; + * optional uint32 roll_shop_id = 11; * @param value the rollShopId to set * @return this */ @@ -118,39 +118,39 @@ public final class DoGachaInRollShopCsReqOuterClass { } /** - * optional uint32 gacha_random = 14; - * @return whether the gachaRandom field is set + * optional uint32 BBJIJINJAFK = 12; + * @return whether the bBJIJINJAFK field is set */ - public boolean hasGachaRandom() { + public boolean hasBBJIJINJAFK() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 gacha_random = 14; + * optional uint32 BBJIJINJAFK = 12; * @return this */ - public DoGachaInRollShopCsReq clearGachaRandom() { + public DoGachaInRollShopCsReq clearBBJIJINJAFK() { bitField0_ &= ~0x00000004; - gachaRandom = 0; + bBJIJINJAFK = 0; return this; } /** - * optional uint32 gacha_random = 14; - * @return the gachaRandom + * optional uint32 BBJIJINJAFK = 12; + * @return the bBJIJINJAFK */ - public int getGachaRandom() { - return gachaRandom; + public int getBBJIJINJAFK() { + return bBJIJINJAFK; } /** - * optional uint32 gacha_random = 14; - * @param value the gachaRandom to set + * optional uint32 BBJIJINJAFK = 12; + * @param value the bBJIJINJAFK to set * @return this */ - public DoGachaInRollShopCsReq setGachaRandom(final int value) { + public DoGachaInRollShopCsReq setBBJIJINJAFK(final int value) { bitField0_ |= 0x00000004; - gachaRandom = value; + bBJIJINJAFK = value; return this; } @@ -159,9 +159,9 @@ public final class DoGachaInRollShopCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - bBJIJINJAFK = other.bBJIJINJAFK; - rollShopId = other.rollShopId; gachaRandom = other.gachaRandom; + rollShopId = other.rollShopId; + bBJIJINJAFK = other.bBJIJINJAFK; } return this; } @@ -172,14 +172,14 @@ public final class DoGachaInRollShopCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasBBJIJINJAFK()) { - setBBJIJINJAFK(other.bBJIJINJAFK); + if (other.hasGachaRandom()) { + setGachaRandom(other.gachaRandom); } if (other.hasRollShopId()) { setRollShopId(other.rollShopId); } - if (other.hasGachaRandom()) { - setGachaRandom(other.gachaRandom); + if (other.hasBBJIJINJAFK()) { + setBBJIJINJAFK(other.bBJIJINJAFK); } return this; } @@ -191,9 +191,9 @@ public final class DoGachaInRollShopCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - bBJIJINJAFK = 0; - rollShopId = 0; gachaRandom = 0; + rollShopId = 0; + bBJIJINJAFK = 0; return this; } @@ -217,24 +217,24 @@ public final class DoGachaInRollShopCsReqOuterClass { } DoGachaInRollShopCsReq other = (DoGachaInRollShopCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBBJIJINJAFK() || bBJIJINJAFK == other.bBJIJINJAFK) + && (!hasGachaRandom() || gachaRandom == other.gachaRandom) && (!hasRollShopId() || rollShopId == other.rollShopId) - && (!hasGachaRandom() || gachaRandom == other.gachaRandom); + && (!hasBBJIJINJAFK() || bBJIJINJAFK == other.bBJIJINJAFK); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(bBJIJINJAFK); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(rollShopId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(gachaRandom); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(bBJIJINJAFK); } } @@ -242,13 +242,13 @@ public final class DoGachaInRollShopCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bBJIJINJAFK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); + size += 1 + ProtoSink.computeUInt32SizeNoTag(bBJIJINJAFK); } return size; } @@ -260,27 +260,27 @@ public final class DoGachaInRollShopCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // bBJIJINJAFK - bBJIJINJAFK = input.readUInt32(); + case 40: { + // gachaRandom + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 88) { break; } } - case 104: { + case 88: { // rollShopId rollShopId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { - // gachaRandom - gachaRandom = input.readUInt32(); + case 96: { + // bBJIJINJAFK + bBJIJINJAFK = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class DoGachaInRollShopCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.bBJIJINJAFK, bBJIJINJAFK); + output.writeUInt32(FieldNames.gachaRandom, gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.rollShopId, rollShopId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); + output.writeUInt32(FieldNames.bBJIJINJAFK, bBJIJINJAFK); } output.endObject(); } @@ -323,10 +323,11 @@ public final class DoGachaInRollShopCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1536175796: { - if (input.isAtField(FieldNames.bBJIJINJAFK)) { + case -1635961627: + case -47579616: { + if (input.isAtField(FieldNames.gachaRandom)) { if (!input.trySkipNullValue()) { - bBJIJINJAFK = input.readUInt32(); + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -346,11 +347,10 @@ public final class DoGachaInRollShopCsReqOuterClass { } break; } - case -1635961627: - case -47579616: { - if (input.isAtField(FieldNames.gachaRandom)) { + case -1536175796: { + if (input.isAtField(FieldNames.bBJIJINJAFK)) { if (!input.trySkipNullValue()) { - gachaRandom = input.readUInt32(); + bBJIJINJAFK = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -411,11 +411,11 @@ public final class DoGachaInRollShopCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName bBJIJINJAFK = FieldName.forField("BBJIJINJAFK"); + static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id"); - static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); + static final FieldName bBJIJINJAFK = FieldName.forField("BBJIJINJAFK"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java index 86da20c..0ce3aab 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java @@ -19,27 +19,27 @@ public final class DoGachaInRollShopScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 AFMPDBBHCHM = 2; - */ - private int aFMPDBBHCHM; - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 LEJJOJGNIHK = 12; + * optional uint32 AFMPDBBHCHM = 6; */ - private int lEJJOJGNIHK; + private int aFMPDBBHCHM; /** - * optional uint32 roll_shop_id = 15; + * optional uint32 roll_shop_id = 7; */ private int rollShopId; /** - * optional .ItemList reward = 13; + * optional uint32 LEJJOJGNIHK = 14; + */ + private int lEJJOJGNIHK; + + /** + * optional .ItemList reward = 11; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -54,62 +54,25 @@ public final class DoGachaInRollShopScRspOuterClass { } /** - * optional uint32 AFMPDBBHCHM = 2; - * @return whether the aFMPDBBHCHM field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasAFMPDBBHCHM() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 AFMPDBBHCHM = 2; - * @return this - */ - public DoGachaInRollShopScRsp clearAFMPDBBHCHM() { - bitField0_ &= ~0x00000001; - aFMPDBBHCHM = 0; - return this; - } - - /** - * optional uint32 AFMPDBBHCHM = 2; - * @return the aFMPDBBHCHM - */ - public int getAFMPDBBHCHM() { - return aFMPDBBHCHM; - } - - /** - * optional uint32 AFMPDBBHCHM = 2; - * @param value the aFMPDBBHCHM to set - * @return this - */ - public DoGachaInRollShopScRsp setAFMPDBBHCHM(final int value) { - bitField0_ |= 0x00000001; - aFMPDBBHCHM = 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 = 3; * @return this */ public DoGachaInRollShopScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -117,73 +80,73 @@ public final class DoGachaInRollShopScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ public DoGachaInRollShopScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 LEJJOJGNIHK = 12; - * @return whether the lEJJOJGNIHK field is set + * optional uint32 AFMPDBBHCHM = 6; + * @return whether the aFMPDBBHCHM field is set */ - public boolean hasLEJJOJGNIHK() { + public boolean hasAFMPDBBHCHM() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 AFMPDBBHCHM = 6; + * @return this + */ + public DoGachaInRollShopScRsp clearAFMPDBBHCHM() { + bitField0_ &= ~0x00000002; + aFMPDBBHCHM = 0; + return this; + } + + /** + * optional uint32 AFMPDBBHCHM = 6; + * @return the aFMPDBBHCHM + */ + public int getAFMPDBBHCHM() { + return aFMPDBBHCHM; + } + + /** + * optional uint32 AFMPDBBHCHM = 6; + * @param value the aFMPDBBHCHM to set + * @return this + */ + public DoGachaInRollShopScRsp setAFMPDBBHCHM(final int value) { + bitField0_ |= 0x00000002; + aFMPDBBHCHM = value; + return this; + } + + /** + * optional uint32 roll_shop_id = 7; + * @return whether the rollShopId field is set + */ + public boolean hasRollShopId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 LEJJOJGNIHK = 12; - * @return this - */ - public DoGachaInRollShopScRsp clearLEJJOJGNIHK() { - bitField0_ &= ~0x00000004; - lEJJOJGNIHK = 0; - return this; - } - - /** - * optional uint32 LEJJOJGNIHK = 12; - * @return the lEJJOJGNIHK - */ - public int getLEJJOJGNIHK() { - return lEJJOJGNIHK; - } - - /** - * optional uint32 LEJJOJGNIHK = 12; - * @param value the lEJJOJGNIHK to set - * @return this - */ - public DoGachaInRollShopScRsp setLEJJOJGNIHK(final int value) { - bitField0_ |= 0x00000004; - lEJJOJGNIHK = value; - return this; - } - - /** - * optional uint32 roll_shop_id = 15; - * @return whether the rollShopId field is set - */ - public boolean hasRollShopId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 roll_shop_id = 15; + * optional uint32 roll_shop_id = 7; * @return this */ public DoGachaInRollShopScRsp clearRollShopId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; rollShopId = 0; return this; } /** - * optional uint32 roll_shop_id = 15; + * optional uint32 roll_shop_id = 7; * @return the rollShopId */ public int getRollShopId() { @@ -191,18 +154,55 @@ public final class DoGachaInRollShopScRspOuterClass { } /** - * optional uint32 roll_shop_id = 15; + * optional uint32 roll_shop_id = 7; * @param value the rollShopId to set * @return this */ public DoGachaInRollShopScRsp setRollShopId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; rollShopId = value; return this; } /** - * optional .ItemList reward = 13; + * optional uint32 LEJJOJGNIHK = 14; + * @return whether the lEJJOJGNIHK field is set + */ + public boolean hasLEJJOJGNIHK() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 LEJJOJGNIHK = 14; + * @return this + */ + public DoGachaInRollShopScRsp clearLEJJOJGNIHK() { + bitField0_ &= ~0x00000008; + lEJJOJGNIHK = 0; + return this; + } + + /** + * optional uint32 LEJJOJGNIHK = 14; + * @return the lEJJOJGNIHK + */ + public int getLEJJOJGNIHK() { + return lEJJOJGNIHK; + } + + /** + * optional uint32 LEJJOJGNIHK = 14; + * @param value the lEJJOJGNIHK to set + * @return this + */ + public DoGachaInRollShopScRsp setLEJJOJGNIHK(final int value) { + bitField0_ |= 0x00000008; + lEJJOJGNIHK = value; + return this; + } + + /** + * optional .ItemList reward = 11; * @return whether the reward field is set */ public boolean hasReward() { @@ -210,7 +210,7 @@ public final class DoGachaInRollShopScRspOuterClass { } /** - * optional .ItemList reward = 13; + * optional .ItemList reward = 11; * @return this */ public DoGachaInRollShopScRsp clearReward() { @@ -220,7 +220,7 @@ public final class DoGachaInRollShopScRspOuterClass { } /** - * optional .ItemList reward = 13; + * optional .ItemList reward = 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. @@ -234,7 +234,7 @@ public final class DoGachaInRollShopScRspOuterClass { } /** - * optional .ItemList reward = 13; + * optional .ItemList reward = 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 @@ -248,7 +248,7 @@ public final class DoGachaInRollShopScRspOuterClass { } /** - * optional .ItemList reward = 13; + * optional .ItemList reward = 11; * @param value the reward to set * @return this */ @@ -263,10 +263,10 @@ public final class DoGachaInRollShopScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - aFMPDBBHCHM = other.aFMPDBBHCHM; retcode = other.retcode; - lEJJOJGNIHK = other.lEJJOJGNIHK; + aFMPDBBHCHM = other.aFMPDBBHCHM; rollShopId = other.rollShopId; + lEJJOJGNIHK = other.lEJJOJGNIHK; reward.copyFrom(other.reward); } return this; @@ -278,18 +278,18 @@ public final class DoGachaInRollShopScRspOuterClass { return this; } cachedSize = -1; - if (other.hasAFMPDBBHCHM()) { - setAFMPDBBHCHM(other.aFMPDBBHCHM); - } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasLEJJOJGNIHK()) { - setLEJJOJGNIHK(other.lEJJOJGNIHK); + if (other.hasAFMPDBBHCHM()) { + setAFMPDBBHCHM(other.aFMPDBBHCHM); } if (other.hasRollShopId()) { setRollShopId(other.rollShopId); } + if (other.hasLEJJOJGNIHK()) { + setLEJJOJGNIHK(other.lEJJOJGNIHK); + } if (other.hasReward()) { getMutableReward().mergeFrom(other.reward); } @@ -303,10 +303,10 @@ public final class DoGachaInRollShopScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - aFMPDBBHCHM = 0; retcode = 0; - lEJJOJGNIHK = 0; + aFMPDBBHCHM = 0; rollShopId = 0; + lEJJOJGNIHK = 0; reward.clear(); return this; } @@ -332,33 +332,33 @@ public final class DoGachaInRollShopScRspOuterClass { } DoGachaInRollShopScRsp other = (DoGachaInRollShopScRsp) o; return bitField0_ == other.bitField0_ - && (!hasAFMPDBBHCHM() || aFMPDBBHCHM == other.aFMPDBBHCHM) && (!hasRetcode() || retcode == other.retcode) - && (!hasLEJJOJGNIHK() || lEJJOJGNIHK == other.lEJJOJGNIHK) + && (!hasAFMPDBBHCHM() || aFMPDBBHCHM == other.aFMPDBBHCHM) && (!hasRollShopId() || rollShopId == other.rollShopId) + && (!hasLEJJOJGNIHK() || lEJJOJGNIHK == other.lEJJOJGNIHK) && (!hasReward() || reward.equals(other.reward)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(aFMPDBBHCHM); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(lEJJOJGNIHK); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(aFMPDBBHCHM); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); output.writeUInt32NoTag(rollShopId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(lEJJOJGNIHK); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 90); output.writeMessageNoTag(reward); } } @@ -367,16 +367,16 @@ public final class DoGachaInRollShopScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aFMPDBBHCHM); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(aFMPDBBHCHM); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lEJJOJGNIHK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lEJJOJGNIHK); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(reward); @@ -391,43 +391,43 @@ public final class DoGachaInRollShopScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // aFMPDBBHCHM - aFMPDBBHCHM = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 24: { // retcode retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // aFMPDBBHCHM + aFMPDBBHCHM = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { - // lEJJOJGNIHK - lEJJOJGNIHK = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 56: { // rollShopId rollShopId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 106) { + if (tag != 112) { break; } } - case 106: { + case 112: { + // lEJJOJGNIHK + lEJJOJGNIHK = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // reward input.readMessage(reward); bitField0_ |= 0x00000010; @@ -454,16 +454,16 @@ public final class DoGachaInRollShopScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.aFMPDBBHCHM, aFMPDBBHCHM); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.aFMPDBBHCHM, aFMPDBBHCHM); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.lEJJOJGNIHK, lEJJOJGNIHK); + output.writeUInt32(FieldNames.rollShopId, rollShopId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.rollShopId, rollShopId); + output.writeUInt32(FieldNames.lEJJOJGNIHK, lEJJOJGNIHK); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.reward, reward); @@ -478,10 +478,10 @@ public final class DoGachaInRollShopScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 715464508: { - if (input.isAtField(FieldNames.aFMPDBBHCHM)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - aFMPDBBHCHM = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -489,10 +489,10 @@ public final class DoGachaInRollShopScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 715464508: { + if (input.isAtField(FieldNames.aFMPDBBHCHM)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + aFMPDBBHCHM = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -500,22 +500,22 @@ public final class DoGachaInRollShopScRspOuterClass { } break; } - case -1007707855: { - if (input.isAtField(FieldNames.lEJJOJGNIHK)) { - if (!input.trySkipNullValue()) { - lEJJOJGNIHK = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -904898162: case -1612413630: { if (input.isAtField(FieldNames.rollShopId)) { if (!input.trySkipNullValue()) { rollShopId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1007707855: { + if (input.isAtField(FieldNames.lEJJOJGNIHK)) { + if (!input.trySkipNullValue()) { + lEJJOJGNIHK = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -587,14 +587,14 @@ public final class DoGachaInRollShopScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName aFMPDBBHCHM = FieldName.forField("AFMPDBBHCHM"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName lEJJOJGNIHK = FieldName.forField("LEJJOJGNIHK"); + static final FieldName aFMPDBBHCHM = FieldName.forField("AFMPDBBHCHM"); static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id"); + static final FieldName lEJJOJGNIHK = FieldName.forField("LEJJOJGNIHK"); + static final FieldName reward = FieldName.forField("reward"); } } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java index 60672f5..35fbce6 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java @@ -20,7 +20,17 @@ public final class DoGachaScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 ceiling_num = 3; + * optional uint32 retcode = 4; + */ + private int retcode; + + /** + * optional uint32 gacha_id = 6; + */ + private int gachaId; + + /** + * optional uint32 ceiling_num = 7; */ private int ceilingNum; @@ -30,17 +40,12 @@ public final class DoGachaScRspOuterClass { private int gachaNum; /** - * optional uint32 gacha_id = 10; + * optional uint32 current_gacha_time = 15; */ - private int gachaId; + private int currentGachaTime; /** - * optional uint32 retcode = 14; - */ - private int retcode; - - /** - * repeated .GachaItem gacha_item_list = 2; + * repeated .GachaItem gacha_item_list = 12; */ private final RepeatedMessage gachaItemList = RepeatedMessage.newEmptyInstance(GachaItemOuterClass.GachaItem.getFactory()); @@ -55,25 +60,99 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 ceiling_num = 3; - * @return whether the ceilingNum field is set + * optional uint32 retcode = 4; + * @return whether the retcode field is set */ - public boolean hasCeilingNum() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 ceiling_num = 3; + * optional uint32 retcode = 4; + * @return this + */ + public DoGachaScRsp 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 DoGachaScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional uint32 gacha_id = 6; + * @return whether the gachaId field is set + */ + public boolean hasGachaId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 gacha_id = 6; + * @return this + */ + public DoGachaScRsp clearGachaId() { + bitField0_ &= ~0x00000002; + gachaId = 0; + return this; + } + + /** + * optional uint32 gacha_id = 6; + * @return the gachaId + */ + public int getGachaId() { + return gachaId; + } + + /** + * optional uint32 gacha_id = 6; + * @param value the gachaId to set + * @return this + */ + public DoGachaScRsp setGachaId(final int value) { + bitField0_ |= 0x00000002; + gachaId = value; + return this; + } + + /** + * optional uint32 ceiling_num = 7; + * @return whether the ceilingNum field is set + */ + public boolean hasCeilingNum() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 ceiling_num = 7; * @return this */ public DoGachaScRsp clearCeilingNum() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000004; ceilingNum = 0; return this; } /** - * optional uint32 ceiling_num = 3; + * optional uint32 ceiling_num = 7; * @return the ceilingNum */ public int getCeilingNum() { @@ -81,12 +160,12 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 ceiling_num = 3; + * optional uint32 ceiling_num = 7; * @param value the ceilingNum to set * @return this */ public DoGachaScRsp setCeilingNum(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; ceilingNum = value; return this; } @@ -96,7 +175,7 @@ public final class DoGachaScRspOuterClass { * @return whether the gachaNum field is set */ public boolean hasGachaNum() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -104,7 +183,7 @@ public final class DoGachaScRspOuterClass { * @return this */ public DoGachaScRsp clearGachaNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000008; gachaNum = 0; return this; } @@ -123,105 +202,68 @@ public final class DoGachaScRspOuterClass { * @return this */ public DoGachaScRsp setGachaNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; gachaNum = value; return this; } /** - * optional uint32 gacha_id = 10; - * @return whether the gachaId field is set + * optional uint32 current_gacha_time = 15; + * @return whether the currentGachaTime field is set */ - public boolean hasGachaId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 gacha_id = 10; - * @return this - */ - public DoGachaScRsp clearGachaId() { - bitField0_ &= ~0x00000004; - gachaId = 0; - return this; - } - - /** - * optional uint32 gacha_id = 10; - * @return the gachaId - */ - public int getGachaId() { - return gachaId; - } - - /** - * optional uint32 gacha_id = 10; - * @param value the gachaId to set - * @return this - */ - public DoGachaScRsp setGachaId(final int value) { - bitField0_ |= 0x00000004; - gachaId = value; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 retcode = 14; - * @return this - */ - public DoGachaScRsp clearRetcode() { - bitField0_ &= ~0x00000008; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 14; - * @param value the retcode to set - * @return this - */ - public DoGachaScRsp setRetcode(final int value) { - bitField0_ |= 0x00000008; - retcode = value; - return this; - } - - /** - * repeated .GachaItem gacha_item_list = 2; - * @return whether the gachaItemList field is set - */ - public boolean hasGachaItemList() { + public boolean hasCurrentGachaTime() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .GachaItem gacha_item_list = 2; + * optional uint32 current_gacha_time = 15; + * @return this + */ + public DoGachaScRsp clearCurrentGachaTime() { + bitField0_ &= ~0x00000010; + currentGachaTime = 0; + return this; + } + + /** + * optional uint32 current_gacha_time = 15; + * @return the currentGachaTime + */ + public int getCurrentGachaTime() { + return currentGachaTime; + } + + /** + * optional uint32 current_gacha_time = 15; + * @param value the currentGachaTime to set + * @return this + */ + public DoGachaScRsp setCurrentGachaTime(final int value) { + bitField0_ |= 0x00000010; + currentGachaTime = value; + return this; + } + + /** + * repeated .GachaItem gacha_item_list = 12; + * @return whether the gachaItemList field is set + */ + public boolean hasGachaItemList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .GachaItem gacha_item_list = 12; * @return this */ public DoGachaScRsp clearGachaItemList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000020; gachaItemList.clear(); return this; } /** - * repeated .GachaItem gacha_item_list = 2; + * repeated .GachaItem gacha_item_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -235,7 +277,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 2; + * repeated .GachaItem gacha_item_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -244,28 +286,28 @@ public final class DoGachaScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableGachaItemList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return gachaItemList; } /** - * repeated .GachaItem gacha_item_list = 2; + * repeated .GachaItem gacha_item_list = 12; * @param value the gachaItemList to add * @return this */ public DoGachaScRsp addGachaItemList(final GachaItemOuterClass.GachaItem value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; gachaItemList.add(value); return this; } /** - * repeated .GachaItem gacha_item_list = 2; + * repeated .GachaItem gacha_item_list = 12; * @param values the gachaItemList to add * @return this */ public DoGachaScRsp addAllGachaItemList(final GachaItemOuterClass.GachaItem... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; gachaItemList.addAll(values); return this; } @@ -275,10 +317,11 @@ public final class DoGachaScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + retcode = other.retcode; + gachaId = other.gachaId; ceilingNum = other.ceilingNum; gachaNum = other.gachaNum; - gachaId = other.gachaId; - retcode = other.retcode; + currentGachaTime = other.currentGachaTime; gachaItemList.copyFrom(other.gachaItemList); } return this; @@ -290,17 +333,20 @@ public final class DoGachaScRspOuterClass { return this; } cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasGachaId()) { + setGachaId(other.gachaId); + } if (other.hasCeilingNum()) { setCeilingNum(other.ceilingNum); } if (other.hasGachaNum()) { setGachaNum(other.gachaNum); } - if (other.hasGachaId()) { - setGachaId(other.gachaId); - } - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasCurrentGachaTime()) { + setCurrentGachaTime(other.currentGachaTime); } if (other.hasGachaItemList()) { getMutableGachaItemList().addAll(other.gachaItemList); @@ -315,10 +361,11 @@ public final class DoGachaScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + retcode = 0; + gachaId = 0; ceilingNum = 0; gachaNum = 0; - gachaId = 0; - retcode = 0; + currentGachaTime = 0; gachaItemList.clear(); return this; } @@ -344,34 +391,39 @@ public final class DoGachaScRspOuterClass { } DoGachaScRsp other = (DoGachaScRsp) o; return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasGachaId() || gachaId == other.gachaId) && (!hasCeilingNum() || ceilingNum == other.ceilingNum) && (!hasGachaNum() || gachaNum == other.gachaNum) - && (!hasGachaId() || gachaId == other.gachaId) - && (!hasRetcode() || retcode == other.retcode) + && (!hasCurrentGachaTime() || currentGachaTime == other.currentGachaTime) && (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(ceilingNum); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(gachaId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(ceilingNum); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(gachaNum); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(gachaId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); - } if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(currentGachaTime); + } + if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < gachaItemList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(gachaItemList.get(i)); } } @@ -381,18 +433,21 @@ public final class DoGachaScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + } if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(currentGachaTime); + } + if ((bitField0_ & 0x00000020) != 0) { size += (1 * gachaItemList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaItemList); } return size; @@ -405,10 +460,28 @@ public final class DoGachaScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // gachaId + gachaId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { // ceilingNum ceilingNum = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 64) { break; @@ -417,34 +490,25 @@ public final class DoGachaScRspOuterClass { case 64: { // gachaNum gachaNum = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // gachaId - gachaId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // retcode - retcode = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { + if (tag != 120) { break; } } - case 18: { + case 120: { + // currentGachaTime + currentGachaTime = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { // gachaItemList tag = input.readRepeatedMessage(gachaItemList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; if (tag != 0) { break; } @@ -467,18 +531,21 @@ public final class DoGachaScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.ceilingNum, ceilingNum); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gachaNum, gachaNum); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gachaId, gachaId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.gachaId, gachaId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.ceilingNum, ceilingNum); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.gachaNum, gachaNum); + } if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.currentGachaTime, currentGachaTime); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.gachaItemList, gachaItemList); } output.endObject(); @@ -491,11 +558,10 @@ public final class DoGachaScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1655838327: - case 209119492: { - if (input.isAtField(FieldNames.ceilingNum)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - ceilingNum = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -503,23 +569,23 @@ public final class DoGachaScRspOuterClass { } break; } - case -2052317532: - case 803166025: { - if (input.isAtField(FieldNames.gachaNum)) { - if (!input.trySkipNullValue()) { - gachaNum = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -204751299: case -2052301576: { if (input.isAtField(FieldNames.gachaId)) { if (!input.trySkipNullValue()) { gachaId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1655838327: + case 209119492: { + if (input.isAtField(FieldNames.ceilingNum)) { + if (!input.trySkipNullValue()) { + ceilingNum = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -527,10 +593,11 @@ public final class DoGachaScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -2052317532: + case 803166025: { + if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + gachaNum = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -538,12 +605,24 @@ public final class DoGachaScRspOuterClass { } break; } + case 1941683702: + case 2062533104: { + if (input.isAtField(FieldNames.currentGachaTime)) { + if (!input.trySkipNullValue()) { + currentGachaTime = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } case 725790195: case -1418891315: { if (input.isAtField(FieldNames.gachaItemList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(gachaItemList); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -602,13 +681,15 @@ public final class DoGachaScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); + static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num"); static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); - - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName currentGachaTime = FieldName.forField("currentGachaTime", "current_gacha_time"); 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 9d34887..f4ea257 100644 --- a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class DressAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 5; */ private int avatarId; /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; */ private int equipmentUniqueId; @@ -39,7 +39,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 5; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -47,7 +47,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 5; * @return this */ public DressAvatarCsReq clearAvatarId() { @@ -57,7 +57,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 5; * @return the avatarId */ public int getAvatarId() { @@ -65,7 +65,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 5; * @param value the avatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -84,7 +84,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; * @return this */ public DressAvatarCsReq clearEquipmentUniqueId() { @@ -94,7 +94,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -102,7 +102,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; * @param value the equipmentUniqueId to set * @return this */ @@ -177,11 +177,11 @@ public final class DressAvatarCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(equipmentUniqueId); } } @@ -205,16 +205,16 @@ public final class DressAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 40: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 56) { break; } } - case 32: { + case 56: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java index d144664..8a27bcd 100644 --- a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class DressRelicAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 15; */ private int avatarId; /** - * repeated .RelicParam param_list = 4; + * repeated .RelicParam param_list = 13; */ private final RepeatedMessage paramList = RepeatedMessage.newEmptyInstance(RelicParamOuterClass.RelicParam.getFactory()); @@ -40,7 +40,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 15; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -48,7 +48,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 15; * @return this */ public DressRelicAvatarCsReq clearAvatarId() { @@ -58,7 +58,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 15; * @return the avatarId */ public int getAvatarId() { @@ -66,7 +66,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 15; * @param value the avatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 4; + * repeated .RelicParam param_list = 13; * @return whether the paramList field is set */ public boolean hasParamList() { @@ -85,7 +85,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 4; + * repeated .RelicParam param_list = 13; * @return this */ public DressRelicAvatarCsReq clearParamList() { @@ -95,7 +95,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 4; + * repeated .RelicParam param_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 4; + * repeated .RelicParam param_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 4; + * repeated .RelicParam param_list = 13; * @param value the paramList to add * @return this */ @@ -134,7 +134,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 4; + * repeated .RelicParam param_list = 13; * @param values the paramList to add * @return this */ @@ -210,12 +210,12 @@ public final class DressRelicAvatarCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < paramList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 106); output.writeMessageNoTag(paramList.get(i)); } } @@ -240,16 +240,16 @@ public final class DressRelicAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 120: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 106) { break; } } - case 34: { + case 106: { // paramList tag = input.readRepeatedMessage(paramList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java index 306c67f..c40a883 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 = 8; + * optional uint32 talent_id = 2; */ private int talentId; @@ -34,7 +34,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 2; * @return whether the talentId field is set */ public boolean hasTalentId() { @@ -42,7 +42,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 2; * @return this */ public EnableRogueTalentCsReq clearTalentId() { @@ -52,7 +52,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 2; * @return the talentId */ public int getTalentId() { @@ -60,7 +60,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 2; * @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) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(talentId); } } @@ -150,7 +150,7 @@ public final class EnableRogueTalentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 16: { // 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 40dd29a..cb0bb17 100644 --- a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java @@ -19,12 +19,12 @@ public final class EnableRogueTalentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .RogueTalentInfo talent_info = 3; + * optional .RogueTalentInfo talent_info = 6; */ private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return this */ public EnableRogueTalentScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 3; + * optional .RogueTalentInfo talent_info = 6; * @return whether the talentInfo field is set */ public boolean hasTalentInfo() { @@ -84,7 +84,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 3; + * optional .RogueTalentInfo talent_info = 6; * @return this */ public EnableRogueTalentScRsp clearTalentInfo() { @@ -94,7 +94,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 3; + * 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 EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 3; + * 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 EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 3; + * optional .RogueTalentInfo talent_info = 6; * @param value the talentInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class EnableRogueTalentScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 50); output.writeMessageNoTag(talentInfo); } } @@ -227,16 +227,16 @@ public final class EnableRogueTalentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 50) { break; } } - case 26: { + case 50: { // talentInfo input.readMessage(talentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java index 5a76293..1e8c4e2 100644 --- a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 5; */ private int buffId; @@ -34,7 +34,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { } /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 5; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -42,7 +42,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { } /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 5; * @return this */ public EnhanceRogueBuffCsReq clearBuffId() { @@ -52,7 +52,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { } /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 5; * @return the buffId */ public int getBuffId() { @@ -60,7 +60,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { } /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 5; * @param value the buffId to set * @return this */ @@ -129,7 +129,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(buffId); } } @@ -150,7 +150,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 40: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java index 7f1d305..b6b5d98 100644 --- a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java @@ -19,17 +19,17 @@ public final class EnhanceRogueBuffScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional bool is_success = 3; + * optional bool is_success = 1; */ private boolean isSuccess; /** - * optional .RogueBuff rogue_buff = 11; + * optional .RogueBuff rogue_buff = 15; */ private final RogueBuffOuterClass.RogueBuff rogueBuff = RogueBuffOuterClass.RogueBuff.newInstance(); @@ -44,7 +44,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return this */ public EnhanceRogueBuffScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional bool is_success = 3; + * optional bool is_success = 1; * @return whether the isSuccess field is set */ public boolean hasIsSuccess() { @@ -89,7 +89,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional bool is_success = 3; + * optional bool is_success = 1; * @return this */ public EnhanceRogueBuffScRsp clearIsSuccess() { @@ -99,7 +99,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional bool is_success = 3; + * optional bool is_success = 1; * @return the isSuccess */ public boolean getIsSuccess() { @@ -107,7 +107,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional bool is_success = 3; + * optional bool is_success = 1; * @param value the isSuccess to set * @return this */ @@ -118,7 +118,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 11; + * optional .RogueBuff rogue_buff = 15; * @return whether the rogueBuff field is set */ public boolean hasRogueBuff() { @@ -126,7 +126,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 11; + * optional .RogueBuff rogue_buff = 15; * @return this */ public EnhanceRogueBuffScRsp clearRogueBuff() { @@ -136,7 +136,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 11; + * optional .RogueBuff rogue_buff = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 11; + * optional .RogueBuff rogue_buff = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 11; + * optional .RogueBuff rogue_buff = 15; * @param value the rogueBuff to set * @return this */ @@ -246,15 +246,15 @@ public final class EnhanceRogueBuffScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isSuccess); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 122); output.writeMessageNoTag(rogueBuff); } } @@ -281,25 +281,25 @@ public final class EnhanceRogueBuffScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 8) { break; } } - case 24: { + case 8: { // isSuccess isSuccess = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 122) { break; } } - case 90: { + case 122: { // rogueBuff input.readMessage(rogueBuff); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java index 618b680..44ec70d 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 = 14; + * optional .MotionInfo motion = 6; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -34,7 +34,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 14; + * optional .MotionInfo motion = 6; * @return whether the motion field is set */ public boolean hasMotion() { @@ -42,7 +42,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 14; + * optional .MotionInfo motion = 6; * @return this */ public EnterMapRotationRegionCsReq clearMotion() { @@ -52,7 +52,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 14; + * 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. @@ -66,7 +66,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 14; + * 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 @@ -80,7 +80,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 14; + * optional .MotionInfo motion = 6; * @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) 114); + output.writeRawByte((byte) 50); output.writeMessageNoTag(motion); } } @@ -171,7 +171,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 50: { // 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 f1572b1..1d4e981 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java @@ -19,15 +19,15 @@ public final class EnterMapRotationRegionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 14; - */ - private int retcode; - - /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 2; */ private int clientPosVersion; + /** + * optional uint32 retcode = 15; + */ + private int retcode; + /** * optional .MotionInfo motion = 6; */ @@ -44,62 +44,25 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set + * optional uint32 client_pos_version = 2; + * @return whether the clientPosVersion field is set */ - public boolean hasRetcode() { + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 14; - * @return this - */ - public EnterMapRotationRegionScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 14; - * @param value the retcode to set - * @return this - */ - public EnterMapRotationRegionScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * 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; + * optional uint32 client_pos_version = 2; * @return this */ public EnterMapRotationRegionScRsp clearClientPosVersion() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; clientPosVersion = 0; return this; } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 2; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -107,16 +70,53 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 2; * @param value the clientPosVersion to set * @return this */ public EnterMapRotationRegionScRsp setClientPosVersion(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; clientPosVersion = 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 EnterMapRotationRegionScRsp 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 EnterMapRotationRegionScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + /** * optional .MotionInfo motion = 6; * @return whether the motion field is set @@ -179,8 +179,8 @@ public final class EnterMapRotationRegionScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; clientPosVersion = other.clientPosVersion; + retcode = other.retcode; motion.copyFrom(other.motion); } return this; @@ -192,12 +192,12 @@ public final class EnterMapRotationRegionScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } @@ -211,8 +211,8 @@ public final class EnterMapRotationRegionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; clientPosVersion = 0; + retcode = 0; motion.clear(); return this; } @@ -238,20 +238,20 @@ public final class EnterMapRotationRegionScRspOuterClass { } EnterMapRotationRegionScRsp other = (EnterMapRotationRegionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasRetcode() || retcode == other.retcode) && (!hasMotion() || motion.equals(other.motion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(clientPosVersion); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 50); @@ -263,10 +263,10 @@ public final class EnterMapRotationRegionScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -281,9 +281,9 @@ public final class EnterMapRotationRegionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { - // retcode - retcode = input.readUInt32(); + case 16: { + // clientPosVersion + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { @@ -291,8 +291,8 @@ public final class EnterMapRotationRegionScRspOuterClass { } } case 120: { - // clientPosVersion - clientPosVersion = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 50) { @@ -326,10 +326,10 @@ public final class EnterMapRotationRegionScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -344,10 +344,11 @@ public final class EnterMapRotationRegionScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -355,11 +356,10 @@ public final class EnterMapRotationRegionScRspOuterClass { } break; } - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class EnterMapRotationRegionScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName motion = FieldName.forField("motion"); } } diff --git a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java index 8af781e..0d47df5 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 room_id = 1; - */ - private int roomId; - - /** - * optional uint32 site_id = 14; + * optional uint32 site_id = 1; */ private int siteId; + /** + * optional uint32 room_id = 9; + */ + private int roomId; + private EnterRogueMapRoomCsReq() { } @@ -39,62 +39,25 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 1; - * @return whether the roomId field is set + * optional uint32 site_id = 1; + * @return whether the siteId field is set */ - public boolean hasRoomId() { + public boolean hasSiteId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 room_id = 1; - * @return this - */ - public EnterRogueMapRoomCsReq clearRoomId() { - bitField0_ &= ~0x00000001; - roomId = 0; - return this; - } - - /** - * optional uint32 room_id = 1; - * @return the roomId - */ - public int getRoomId() { - return roomId; - } - - /** - * optional uint32 room_id = 1; - * @param value the roomId to set - * @return this - */ - public EnterRogueMapRoomCsReq setRoomId(final int value) { - 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; + * optional uint32 site_id = 1; * @return this */ public EnterRogueMapRoomCsReq clearSiteId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; siteId = 0; return this; } /** - * optional uint32 site_id = 14; + * optional uint32 site_id = 1; * @return the siteId */ public int getSiteId() { @@ -102,23 +65,60 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 site_id = 14; + * optional uint32 site_id = 1; * @param value the siteId to set * @return this */ public EnterRogueMapRoomCsReq setSiteId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; siteId = value; return this; } + /** + * optional uint32 room_id = 9; + * @return whether the roomId field is set + */ + public boolean hasRoomId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 room_id = 9; + * @return this + */ + public EnterRogueMapRoomCsReq clearRoomId() { + bitField0_ &= ~0x00000002; + roomId = 0; + return this; + } + + /** + * optional uint32 room_id = 9; + * @return the roomId + */ + public int getRoomId() { + return roomId; + } + + /** + * optional uint32 room_id = 9; + * @param value the roomId to set + * @return this + */ + public EnterRogueMapRoomCsReq setRoomId(final int value) { + bitField0_ |= 0x00000002; + roomId = value; + return this; + } + @Override public EnterRogueMapRoomCsReq copyFrom(final EnterRogueMapRoomCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - roomId = other.roomId; siteId = other.siteId; + roomId = other.roomId; } return this; } @@ -129,12 +129,12 @@ public final class EnterRogueMapRoomCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasRoomId()) { - setRoomId(other.roomId); - } if (other.hasSiteId()) { setSiteId(other.siteId); } + if (other.hasRoomId()) { + setRoomId(other.roomId); + } return this; } @@ -145,8 +145,8 @@ public final class EnterRogueMapRoomCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - roomId = 0; siteId = 0; + roomId = 0; return this; } @@ -170,19 +170,19 @@ public final class EnterRogueMapRoomCsReqOuterClass { } EnterRogueMapRoomCsReq other = (EnterRogueMapRoomCsReq) o; return bitField0_ == other.bitField0_ - && (!hasRoomId() || roomId == other.roomId) - && (!hasSiteId() || siteId == other.siteId); + && (!hasSiteId() || siteId == other.siteId) + && (!hasRoomId() || roomId == other.roomId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(roomId); + output.writeUInt32NoTag(siteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(siteId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(roomId); } } @@ -190,10 +190,10 @@ public final class EnterRogueMapRoomCsReqOuterClass { 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); } return size; } @@ -206,17 +206,17 @@ public final class EnterRogueMapRoomCsReqOuterClass { while (true) { switch (tag) { case 8: { - // roomId - roomId = input.readUInt32(); + // siteId + siteId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 72) { break; } } - case 112: { - // siteId - siteId = input.readUInt32(); + case 72: { + // roomId + roomId = 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.roomId, roomId); + output.writeUInt32(FieldNames.siteId, siteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.siteId, siteId); + output.writeUInt32(FieldNames.roomId, roomId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class EnterRogueMapRoomCsReqOuterClass { } 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 { @@ -268,11 +268,11 @@ public final class EnterRogueMapRoomCsReqOuterClass { } 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 { @@ -333,9 +333,9 @@ public final class EnterRogueMapRoomCsReqOuterClass { * 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"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java index a3a5c9e..27995a7 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java @@ -19,22 +19,22 @@ public final class EnterRogueMapRoomScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; - */ - private int retcode; - - /** - * optional uint32 cur_site_id = 10; + * optional uint32 cur_site_id = 6; */ private int curSiteId; /** - * optional .SceneInfo scene = 13; + * optional uint32 retcode = 8; + */ + private int retcode; + + /** + * optional .SceneInfo scene = 3; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 14; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -49,62 +49,25 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 retcode = 7; - * @return whether the retcode field is set + * optional uint32 cur_site_id = 6; + * @return whether the curSiteId field is set */ - public boolean hasRetcode() { + public boolean hasCurSiteId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 7; - * @return this - */ - public EnterRogueMapRoomScRsp 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 EnterRogueMapRoomScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 cur_site_id = 10; - * @return whether the curSiteId field is set - */ - public boolean hasCurSiteId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_site_id = 10; + * optional uint32 cur_site_id = 6; * @return this */ public EnterRogueMapRoomScRsp clearCurSiteId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curSiteId = 0; return this; } /** - * optional uint32 cur_site_id = 10; + * optional uint32 cur_site_id = 6; * @return the curSiteId */ public int getCurSiteId() { @@ -112,18 +75,55 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 cur_site_id = 10; + * optional uint32 cur_site_id = 6; * @param value the curSiteId to set * @return this */ public EnterRogueMapRoomScRsp setCurSiteId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; curSiteId = value; return this; } /** - * optional .SceneInfo scene = 13; + * 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 EnterRogueMapRoomScRsp 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 EnterRogueMapRoomScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .SceneInfo scene = 3; * @return whether the scene field is set */ public boolean hasScene() { @@ -131,7 +131,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 3; * @return this */ public EnterRogueMapRoomScRsp clearScene() { @@ -141,7 +141,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -155,7 +155,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -169,7 +169,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 3; * @param value the scene to set * @return this */ @@ -180,7 +180,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 14; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -188,7 +188,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 14; * @return this */ public EnterRogueMapRoomScRsp clearLineup() { @@ -198,7 +198,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 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. @@ -212,7 +212,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 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 @@ -226,7 +226,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 14; * @param value the lineup to set * @return this */ @@ -241,8 +241,8 @@ public final class EnterRogueMapRoomScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; curSiteId = other.curSiteId; + retcode = other.retcode; scene.copyFrom(other.scene); lineup.copyFrom(other.lineup); } @@ -255,12 +255,12 @@ public final class EnterRogueMapRoomScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurSiteId()) { setCurSiteId(other.curSiteId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } @@ -277,8 +277,8 @@ public final class EnterRogueMapRoomScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; curSiteId = 0; + retcode = 0; scene.clear(); lineup.clear(); return this; @@ -306,8 +306,8 @@ public final class EnterRogueMapRoomScRspOuterClass { } EnterRogueMapRoomScRsp other = (EnterRogueMapRoomScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasCurSiteId() || curSiteId == other.curSiteId) + && (!hasRetcode() || retcode == other.retcode) && (!hasScene() || scene.equals(other.scene)) && (!hasLineup() || lineup.equals(other.lineup)); } @@ -315,19 +315,19 @@ public final class EnterRogueMapRoomScRspOuterClass { @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) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(curSiteId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 26); output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 114); output.writeMessageNoTag(lineup); } } @@ -336,10 +336,10 @@ public final class EnterRogueMapRoomScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(scene); @@ -357,34 +357,34 @@ public final class EnterRogueMapRoomScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 48: { // curSiteId curSiteId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 64) { break; } } - case 106: { + case 64: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 26) { + break; + } + } + case 26: { // scene input.readMessage(scene); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { + case 114: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000008; @@ -411,10 +411,10 @@ public final class EnterRogueMapRoomScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curSiteId, curSiteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curSiteId, curSiteId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.scene, scene); @@ -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 { @@ -530,10 +530,10 @@ 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 retcode = FieldName.forField("retcode"); + static final FieldName scene = FieldName.forField("scene"); static final FieldName lineup = FieldName.forField("lineup"); diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java index b75b675..e46bade 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java @@ -19,20 +19,20 @@ public final class EnterSceneByServerScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .EnterSceneReason reason = 1; + * optional .EnterSceneReason reason = 11; */ private int reason; /** - * optional .LineupInfo lineup = 7; - */ - private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); - - /** - * optional .SceneInfo scene = 10; + * optional .SceneInfo scene = 7; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + /** + * optional .LineupInfo lineup = 14; + */ + private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + private EnterSceneByServerScNotify() { } @@ -44,7 +44,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 1; + * optional .EnterSceneReason reason = 11; * @return whether the reason field is set */ public boolean hasReason() { @@ -52,7 +52,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 1; + * optional .EnterSceneReason reason = 11; * @return this */ public EnterSceneByServerScNotify clearReason() { @@ -62,7 +62,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 1; + * optional .EnterSceneReason reason = 11; * @return the reason */ public EnterSceneReasonOuterClass.EnterSceneReason getReason() { @@ -95,7 +95,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 1; + * optional .EnterSceneReason reason = 11; * @param value the reason to set * @return this */ @@ -107,82 +107,25 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 7; - * @return whether the lineup field is set + * optional .SceneInfo scene = 7; + * @return whether the scene field is set */ - public boolean hasLineup() { + public boolean hasScene() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .LineupInfo lineup = 7; - * @return this - */ - public EnterSceneByServerScNotify clearLineup() { - bitField0_ &= ~0x00000002; - 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_ |= 0x00000002; - return lineup; - } - - /** - * optional .LineupInfo lineup = 7; - * @param value the lineup to set - * @return this - */ - public EnterSceneByServerScNotify setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000002; - lineup.copyFrom(value); - return this; - } - - /** - * optional .SceneInfo scene = 10; - * @return whether the scene field is set - */ - public boolean hasScene() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .SceneInfo scene = 10; + * optional .SceneInfo scene = 7; * @return this */ public EnterSceneByServerScNotify clearScene() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; scene.clear(); return this; } /** - * optional .SceneInfo scene = 10; + * 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. @@ -196,7 +139,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 10; + * 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 @@ -205,29 +148,86 @@ public final class EnterSceneByServerScNotifyOuterClass { * @return internal storage object for modifications */ public SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return scene; } /** - * optional .SceneInfo scene = 10; + * optional .SceneInfo scene = 7; * @param value the scene to set * @return this */ public EnterSceneByServerScNotify setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; scene.copyFrom(value); return this; } + /** + * optional .LineupInfo lineup = 14; + * @return whether the lineup field is set + */ + public boolean hasLineup() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .LineupInfo lineup = 14; + * @return this + */ + public EnterSceneByServerScNotify clearLineup() { + bitField0_ &= ~0x00000004; + lineup.clear(); + return this; + } + + /** + * optional .LineupInfo lineup = 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 #getMutableLineup()} if you want to modify it. + * + * @return internal storage object for reading + */ + public LineupInfoOuterClass.LineupInfo getLineup() { + return lineup; + } + + /** + * optional .LineupInfo lineup = 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 LineupInfoOuterClass.LineupInfo getMutableLineup() { + bitField0_ |= 0x00000004; + return lineup; + } + + /** + * optional .LineupInfo lineup = 14; + * @param value the lineup to set + * @return this + */ + public EnterSceneByServerScNotify setLineup(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000004; + lineup.copyFrom(value); + return this; + } + @Override public EnterSceneByServerScNotify copyFrom(final EnterSceneByServerScNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; reason = other.reason; - lineup.copyFrom(other.lineup); scene.copyFrom(other.scene); + lineup.copyFrom(other.lineup); } return this; } @@ -241,12 +241,12 @@ public final class EnterSceneByServerScNotifyOuterClass { if (other.hasReason()) { setReasonValue(other.reason); } - if (other.hasLineup()) { - getMutableLineup().mergeFrom(other.lineup); - } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } + if (other.hasLineup()) { + getMutableLineup().mergeFrom(other.lineup); + } return this; } @@ -258,8 +258,8 @@ public final class EnterSceneByServerScNotifyOuterClass { cachedSize = -1; bitField0_ = 0; reason = 0; - lineup.clear(); scene.clear(); + lineup.clear(); return this; } @@ -270,8 +270,8 @@ public final class EnterSceneByServerScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - lineup.clearQuick(); scene.clearQuick(); + lineup.clearQuick(); return this; } @@ -286,23 +286,23 @@ public final class EnterSceneByServerScNotifyOuterClass { EnterSceneByServerScNotify other = (EnterSceneByServerScNotify) o; return bitField0_ == other.bitField0_ && (!hasReason() || reason == other.reason) - && (!hasLineup() || lineup.equals(other.lineup)) - && (!hasScene() || scene.equals(other.scene)); + && (!hasScene() || scene.equals(other.scene)) + && (!hasLineup() || lineup.equals(other.lineup)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 88); output.writeEnumNoTag(reason); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 58); - output.writeMessageNoTag(lineup); + output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(scene); + output.writeRawByte((byte) 114); + output.writeMessageNoTag(lineup); } } @@ -313,10 +313,10 @@ public final class EnterSceneByServerScNotifyOuterClass { size += 1 + ProtoSink.computeEnumSizeNoTag(reason); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } return size; } @@ -328,7 +328,7 @@ public final class EnterSceneByServerScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 88: { // reason final int value = input.readInt32(); if (EnterSceneReasonOuterClass.EnterSceneReason.forNumber(value) != null) { @@ -341,17 +341,17 @@ public final class EnterSceneByServerScNotifyOuterClass { } } case 58: { - // lineup - input.readMessage(lineup); + // scene + input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 114) { break; } } - case 82: { - // scene - input.readMessage(scene); + case 114: { + // lineup + input.readMessage(lineup); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -379,10 +379,10 @@ public final class EnterSceneByServerScNotifyOuterClass { output.writeEnum(FieldNames.reason, reason, EnterSceneReasonOuterClass.EnterSceneReason.converter()); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.scene, scene); + output.writeMessage(FieldNames.lineup, lineup); } output.endObject(); } @@ -410,10 +410,10 @@ public final class EnterSceneByServerScNotifyOuterClass { } break; } - case -1102671473: { - if (input.isAtField(FieldNames.lineup)) { + case 109254796: { + if (input.isAtField(FieldNames.scene)) { if (!input.trySkipNullValue()) { - input.readMessage(lineup); + input.readMessage(scene); bitField0_ |= 0x00000002; } } else { @@ -421,10 +421,10 @@ public final class EnterSceneByServerScNotifyOuterClass { } break; } - case 109254796: { - if (input.isAtField(FieldNames.scene)) { + case -1102671473: { + if (input.isAtField(FieldNames.lineup)) { if (!input.trySkipNullValue()) { - input.readMessage(scene); + input.readMessage(lineup); bitField0_ |= 0x00000004; } } else { @@ -487,9 +487,9 @@ public final class EnterSceneByServerScNotifyOuterClass { static class FieldNames { static final FieldName reason = FieldName.forField("reason"); - static final FieldName lineup = FieldName.forField("lineup"); - static final FieldName scene = FieldName.forField("scene"); + + static final FieldName lineup = FieldName.forField("lineup"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java index 8fc9b7c..0cc7704 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class EnterSceneCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 3; */ private int entryId; /** - * optional uint32 teleport_id = 10; + * optional uint32 teleport_id = 9; */ private int teleportId; @@ -39,7 +39,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 3; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -47,7 +47,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 3; * @return this */ public EnterSceneCsReq clearEntryId() { @@ -57,7 +57,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 3; * @return the entryId */ public int getEntryId() { @@ -65,7 +65,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 3; * @param value the entryId to set * @return this */ @@ -76,7 +76,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 10; + * optional uint32 teleport_id = 9; * @return whether the teleportId field is set */ public boolean hasTeleportId() { @@ -84,7 +84,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 10; + * optional uint32 teleport_id = 9; * @return this */ public EnterSceneCsReq clearTeleportId() { @@ -94,7 +94,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 10; + * optional uint32 teleport_id = 9; * @return the teleportId */ public int getTeleportId() { @@ -102,7 +102,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 10; + * optional uint32 teleport_id = 9; * @param value the teleportId to set * @return this */ @@ -177,11 +177,11 @@ public final class EnterSceneCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(teleportId); } } @@ -205,16 +205,16 @@ public final class EnterSceneCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 72) { break; } } - case 80: { + case 72: { // teleportId teleportId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneReasonOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneReasonOuterClass.java index 834d374..34ef346 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneReasonOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneReasonOuterClass.java @@ -67,7 +67,7 @@ public final class EnterSceneReasonOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return EnterSceneReasonConverter.INSTANCE; } @@ -89,7 +89,7 @@ public final class EnterSceneReasonOuterClass { return value == null ? other : value; } - enum EnterSceneReasonConverter implements EnumConverter { + enum EnterSceneReasonConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final EnterSceneReason[] lookup = new EnterSceneReason[3]; diff --git a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java index 7a48cc1..cd704db 100644 --- a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java @@ -19,15 +19,15 @@ public final class EnteredSceneInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 6; - */ - private int planeId; - - /** - * optional uint32 floor_id = 11; + * optional uint32 floor_id = 6; */ private int floorId; + /** + * optional uint32 plane_id = 12; + */ + private int planeId; + private EnteredSceneInfo() { } @@ -39,62 +39,25 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 plane_id = 6; - * @return whether the planeId field is set + * optional uint32 floor_id = 6; + * @return whether the floorId field is set */ - public boolean hasPlaneId() { + public boolean hasFloorId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 plane_id = 6; - * @return this - */ - public EnteredSceneInfo 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 EnteredSceneInfo setPlaneId(final int value) { - bitField0_ |= 0x00000001; - planeId = value; - return this; - } - - /** - * optional uint32 floor_id = 11; - * @return whether the floorId field is set - */ - public boolean hasFloorId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 floor_id = 11; + * optional uint32 floor_id = 6; * @return this */ public EnteredSceneInfo clearFloorId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; floorId = 0; return this; } /** - * optional uint32 floor_id = 11; + * optional uint32 floor_id = 6; * @return the floorId */ public int getFloorId() { @@ -102,23 +65,60 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 11; + * optional uint32 floor_id = 6; * @param value the floorId to set * @return this */ public EnteredSceneInfo setFloorId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; floorId = value; return this; } + /** + * optional uint32 plane_id = 12; + * @return whether the planeId field is set + */ + public boolean hasPlaneId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 plane_id = 12; + * @return this + */ + public EnteredSceneInfo clearPlaneId() { + bitField0_ &= ~0x00000002; + planeId = 0; + return this; + } + + /** + * optional uint32 plane_id = 12; + * @return the planeId + */ + public int getPlaneId() { + return planeId; + } + + /** + * optional uint32 plane_id = 12; + * @param value the planeId to set + * @return this + */ + public EnteredSceneInfo setPlaneId(final int value) { + bitField0_ |= 0x00000002; + planeId = value; + return this; + } + @Override public EnteredSceneInfo copyFrom(final EnteredSceneInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - planeId = other.planeId; floorId = other.floorId; + planeId = other.planeId; } return this; } @@ -129,12 +129,12 @@ public final class EnteredSceneInfoOuterClass { return this; } cachedSize = -1; - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasFloorId()) { setFloorId(other.floorId); } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } return this; } @@ -145,8 +145,8 @@ public final class EnteredSceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - planeId = 0; floorId = 0; + planeId = 0; return this; } @@ -170,19 +170,19 @@ public final class EnteredSceneInfoOuterClass { } EnteredSceneInfo other = (EnteredSceneInfo) o; return bitField0_ == other.bitField0_ - && (!hasPlaneId() || planeId == other.planeId) - && (!hasFloorId() || floorId == other.floorId); + && (!hasFloorId() || floorId == other.floorId) + && (!hasPlaneId() || planeId == other.planeId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(planeId); + output.writeUInt32NoTag(floorId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(floorId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(planeId); } } @@ -190,10 +190,10 @@ public final class EnteredSceneInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } return size; } @@ -206,17 +206,17 @@ public final class EnteredSceneInfoOuterClass { while (true) { switch (tag) { case 48: { - // planeId - planeId = input.readUInt32(); + // floorId + floorId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // floorId - floorId = input.readUInt32(); + case 96: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class EnteredSceneInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.floorId, floorId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.floorId, floorId); + output.writeUInt32(FieldNames.planeId, planeId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class EnteredSceneInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case -766027193: + case 2022982190: { + if (input.isAtField(FieldNames.floorId)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + floorId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class EnteredSceneInfoOuterClass { } break; } - case -766027193: - case 2022982190: { - if (input.isAtField(FieldNames.floorId)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - floorId = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class EnteredSceneInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName floorId = FieldName.forField("floorId", "floor_id"); + + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java index 439a9c2..0ad9681 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 entity_id = 12; - */ - private int entityId; - - /** - * optional uint32 remove_buff_id = 15; + * optional uint32 remove_buff_id = 9; */ private int removeBuffId; /** - * optional .BuffInfo add_buff_info = 5; + * optional uint32 entity_id = 13; + */ + private int entityId; + + /** + * optional .BuffInfo add_buff_info = 8; */ private final BuffInfoOuterClass.BuffInfo addBuffInfo = BuffInfoOuterClass.BuffInfo.newInstance(); @@ -44,62 +44,25 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional uint32 entity_id = 12; - * @return whether the entityId field is set + * optional uint32 remove_buff_id = 9; + * @return whether the removeBuffId field is set */ - public boolean hasEntityId() { + public boolean hasRemoveBuffId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 12; - * @return this - */ - public EntityBuffChangeInfo clearEntityId() { - bitField0_ &= ~0x00000001; - 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 EntityBuffChangeInfo setEntityId(final int value) { - bitField0_ |= 0x00000001; - entityId = value; - return this; - } - - /** - * 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; + * optional uint32 remove_buff_id = 9; * @return this */ public EntityBuffChangeInfo clearRemoveBuffId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; removeBuffId = 0; return this; } /** - * optional uint32 remove_buff_id = 15; + * optional uint32 remove_buff_id = 9; * @return the removeBuffId */ public int getRemoveBuffId() { @@ -107,18 +70,55 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional uint32 remove_buff_id = 15; + * optional uint32 remove_buff_id = 9; * @param value the removeBuffId to set * @return this */ public EntityBuffChangeInfo setRemoveBuffId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; removeBuffId = value; return this; } /** - * optional .BuffInfo add_buff_info = 5; + * optional uint32 entity_id = 13; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 entity_id = 13; + * @return this + */ + public EntityBuffChangeInfo clearEntityId() { + bitField0_ &= ~0x00000002; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 13; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 13; + * @param value the entityId to set + * @return this + */ + public EntityBuffChangeInfo setEntityId(final int value) { + bitField0_ |= 0x00000002; + entityId = value; + return this; + } + + /** + * optional .BuffInfo add_buff_info = 8; * @return whether the addBuffInfo field is set */ public boolean hasAddBuffInfo() { @@ -126,7 +126,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 5; + * optional .BuffInfo add_buff_info = 8; * @return this */ public EntityBuffChangeInfo clearAddBuffInfo() { @@ -136,7 +136,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 5; + * optional .BuffInfo add_buff_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 EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 5; + * optional .BuffInfo add_buff_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 EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 5; + * optional .BuffInfo add_buff_info = 8; * @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_; - entityId = other.entityId; removeBuffId = other.removeBuffId; + entityId = other.entityId; addBuffInfo.copyFrom(other.addBuffInfo); } return this; @@ -192,12 +192,12 @@ public final class EntityBuffChangeInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasRemoveBuffId()) { setRemoveBuffId(other.removeBuffId); } + if (other.hasEntityId()) { + setEntityId(other.entityId); + } if (other.hasAddBuffInfo()) { getMutableAddBuffInfo().mergeFrom(other.addBuffInfo); } @@ -211,8 +211,8 @@ public final class EntityBuffChangeInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - entityId = 0; removeBuffId = 0; + entityId = 0; addBuffInfo.clear(); return this; } @@ -238,23 +238,23 @@ public final class EntityBuffChangeInfoOuterClass { } EntityBuffChangeInfo other = (EntityBuffChangeInfo) o; return bitField0_ == other.bitField0_ - && (!hasEntityId() || entityId == other.entityId) && (!hasRemoveBuffId() || removeBuffId == other.removeBuffId) + && (!hasEntityId() || entityId == other.entityId) && (!hasAddBuffInfo() || addBuffInfo.equals(other.addBuffInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(removeBuffId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(entityId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 66); 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(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(removeBuffId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(removeBuffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } 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 96: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 72: { // removeBuffId removeBuffId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 104) { break; } } - case 42: { + case 104: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // 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.entityId, entityId); + output.writeUInt32(FieldNames.removeBuffId, removeBuffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.removeBuffId, removeBuffId); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.addBuffInfo, addBuffInfo); @@ -344,11 +344,11 @@ public final class EntityBuffChangeInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -356,11 +356,11 @@ public final class EntityBuffChangeInfoOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public final class EntityBuffChangeInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName removeBuffId = FieldName.forField("removeBuffId", "remove_buff_id"); + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + static final FieldName addBuffInfo = FieldName.forField("addBuffInfo", "add_buff_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java index 2da1db3..56b7210 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; - */ - private int entityId; - - /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 11; */ private int mapLayer; /** - * optional .MotionInfo motion = 15; + * optional uint32 entity_id = 15; + */ + private int entityId; + + /** + * optional .MotionInfo motion = 1; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,62 +44,25 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 4; - * @return whether the entityId field is set + * optional uint32 map_layer = 11; + * @return whether the mapLayer field is set */ - public boolean hasEntityId() { + public boolean hasMapLayer() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 4; - * @return this - */ - public EntityMotion clearEntityId() { - bitField0_ &= ~0x00000001; - entityId = 0; - return this; - } - - /** - * optional uint32 entity_id = 4; - * @return the entityId - */ - public int getEntityId() { - return entityId; - } - - /** - * optional uint32 entity_id = 4; - * @param value the entityId to set - * @return this - */ - public EntityMotion setEntityId(final int value) { - bitField0_ |= 0x00000001; - entityId = value; - return this; - } - - /** - * optional uint32 map_layer = 6; - * @return whether the mapLayer field is set - */ - public boolean hasMapLayer() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 11; * @return this */ public EntityMotion clearMapLayer() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; mapLayer = 0; return this; } /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 11; * @return the mapLayer */ public int getMapLayer() { @@ -107,18 +70,55 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 11; * @param value the mapLayer to set * @return this */ public EntityMotion setMapLayer(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; mapLayer = value; return this; } /** - * optional .MotionInfo motion = 15; + * optional uint32 entity_id = 15; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 entity_id = 15; + * @return this + */ + public EntityMotion clearEntityId() { + bitField0_ &= ~0x00000002; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 15; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 15; + * @param value the entityId to set + * @return this + */ + public EntityMotion setEntityId(final int value) { + bitField0_ |= 0x00000002; + entityId = value; + return this; + } + + /** + * optional .MotionInfo motion = 1; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 1; * @return this */ public EntityMotion clearMotion() { @@ -136,7 +136,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 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 EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 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 EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 1; * @param value the motion to set * @return this */ @@ -179,8 +179,8 @@ public final class EntityMotionOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - entityId = other.entityId; mapLayer = other.mapLayer; + entityId = other.entityId; motion.copyFrom(other.motion); } return this; @@ -192,12 +192,12 @@ public final class EntityMotionOuterClass { return this; } cachedSize = -1; - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasMapLayer()) { setMapLayer(other.mapLayer); } + if (other.hasEntityId()) { + setEntityId(other.entityId); + } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } @@ -211,8 +211,8 @@ public final class EntityMotionOuterClass { } cachedSize = -1; bitField0_ = 0; - entityId = 0; mapLayer = 0; + entityId = 0; motion.clear(); return this; } @@ -238,23 +238,23 @@ public final class EntityMotionOuterClass { } EntityMotion other = (EntityMotion) o; return bitField0_ == other.bitField0_ - && (!hasEntityId() || entityId == other.entityId) && (!hasMapLayer() || mapLayer == other.mapLayer) + && (!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) 32); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(mapLayer); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(entityId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 10); output.writeMessageNoTag(motion); } } @@ -263,10 +263,10 @@ public final class EntityMotionOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -281,25 +281,25 @@ public final class EntityMotionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 88: { // mapLayer mapLayer = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 120) { break; } } - case 122: { + case 120: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public final class EntityMotionOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.mapLayer, mapLayer); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mapLayer, mapLayer); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -344,11 +344,11 @@ public final class EntityMotionOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 160971093: + case 1248553134: { + if (input.isAtField(FieldNames.mapLayer)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + mapLayer = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +356,11 @@ public final class EntityMotionOuterClass { } break; } - case 160971093: - case 1248553134: { - if (input.isAtField(FieldNames.mapLayer)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - mapLayer = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -431,10 +431,10 @@ public final class EntityMotionOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer"); + 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/EquipRelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java index 488557b..497678f 100644 --- a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java @@ -19,12 +19,12 @@ public final class EquipRelicOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 1; + * optional uint32 slot = 9; */ private int slot; /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; */ private int relicUniqueId; @@ -39,7 +39,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 1; + * optional uint32 slot = 9; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 1; + * optional uint32 slot = 9; * @return this */ public EquipRelic clearSlot() { @@ -57,7 +57,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 1; + * optional uint32 slot = 9; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 1; + * optional uint32 slot = 9; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -84,7 +84,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; * @return this */ public EquipRelic clearRelicUniqueId() { @@ -94,7 +94,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,7 +102,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; * @param value the relicUniqueId to set * @return this */ @@ -177,11 +177,11 @@ public final class EquipRelicOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(relicUniqueId); } } @@ -205,16 +205,16 @@ public final class EquipRelicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 72: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java index a03cb77..c8a166f 100644 --- a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java @@ -19,42 +19,42 @@ public final class EquipmentOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 promotion = 1; - */ - private int promotion; - - /** - * optional uint32 rank = 3; - */ - private int rank; - - /** - * optional uint32 equip_avatar_id = 4; + * optional uint32 equip_avatar_id = 5; */ private int equipAvatarId; /** - * optional uint32 unique_id = 6; - */ - private int uniqueId; - - /** - * optional uint32 exp = 9; - */ - private int exp; - - /** - * optional uint32 level = 13; + * optional uint32 level = 6; */ private int level; /** - * optional uint32 tid = 14; + * optional uint32 rank = 7; + */ + private int rank; + + /** + * optional uint32 unique_id = 8; + */ + private int uniqueId; + + /** + * optional uint32 exp = 10; + */ + private int exp; + + /** + * optional uint32 promotion = 12; + */ + private int promotion; + + /** + * optional uint32 tid = 13; */ private int tid; /** - * optional bool is_protected = 15; + * optional bool is_protected = 14; */ private boolean isProtected; @@ -69,99 +69,25 @@ public final class EquipmentOuterClass { } /** - * optional uint32 promotion = 1; - * @return whether the promotion field is set + * optional uint32 equip_avatar_id = 5; + * @return whether the equipAvatarId field is set */ - public boolean hasPromotion() { + public boolean hasEquipAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 promotion = 1; - * @return this - */ - public Equipment 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 Equipment setPromotion(final int value) { - bitField0_ |= 0x00000001; - promotion = value; - return this; - } - - /** - * optional uint32 rank = 3; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 rank = 3; - * @return this - */ - public Equipment clearRank() { - bitField0_ &= ~0x00000002; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 3; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 3; - * @param value the rank to set - * @return this - */ - public Equipment setRank(final int value) { - bitField0_ |= 0x00000002; - rank = value; - return this; - } - - /** - * optional uint32 equip_avatar_id = 4; - * @return whether the equipAvatarId field is set - */ - public boolean hasEquipAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 equip_avatar_id = 4; + * optional uint32 equip_avatar_id = 5; * @return this */ public Equipment clearEquipAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; equipAvatarId = 0; return this; } /** - * optional uint32 equip_avatar_id = 4; + * optional uint32 equip_avatar_id = 5; * @return the equipAvatarId */ public int getEquipAvatarId() { @@ -169,18 +95,92 @@ public final class EquipmentOuterClass { } /** - * optional uint32 equip_avatar_id = 4; + * optional uint32 equip_avatar_id = 5; * @param value the equipAvatarId to set * @return this */ public Equipment setEquipAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; equipAvatarId = value; return this; } /** - * optional uint32 unique_id = 6; + * optional uint32 level = 6; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 level = 6; + * @return this + */ + public Equipment clearLevel() { + bitField0_ &= ~0x00000002; + level = 0; + return this; + } + + /** + * optional uint32 level = 6; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 6; + * @param value the level to set + * @return this + */ + public Equipment setLevel(final int value) { + bitField0_ |= 0x00000002; + level = value; + return this; + } + + /** + * optional uint32 rank = 7; + * @return whether the rank field is set + */ + public boolean hasRank() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 rank = 7; + * @return this + */ + public Equipment clearRank() { + bitField0_ &= ~0x00000004; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 7; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 7; + * @param value the rank to set + * @return this + */ + public Equipment setRank(final int value) { + bitField0_ |= 0x00000004; + rank = value; + return this; + } + + /** + * optional uint32 unique_id = 8; * @return whether the uniqueId field is set */ public boolean hasUniqueId() { @@ -188,7 +188,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 unique_id = 6; + * optional uint32 unique_id = 8; * @return this */ public Equipment clearUniqueId() { @@ -198,7 +198,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 unique_id = 6; + * optional uint32 unique_id = 8; * @return the uniqueId */ public int getUniqueId() { @@ -206,7 +206,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 unique_id = 6; + * optional uint32 unique_id = 8; * @param value the uniqueId to set * @return this */ @@ -217,7 +217,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 exp = 9; + * optional uint32 exp = 10; * @return whether the exp field is set */ public boolean hasExp() { @@ -225,7 +225,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 exp = 9; + * optional uint32 exp = 10; * @return this */ public Equipment clearExp() { @@ -235,7 +235,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 exp = 9; + * optional uint32 exp = 10; * @return the exp */ public int getExp() { @@ -243,7 +243,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 exp = 9; + * optional uint32 exp = 10; * @param value the exp to set * @return this */ @@ -254,44 +254,44 @@ public final class EquipmentOuterClass { } /** - * optional uint32 level = 13; - * @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 = 13; + * optional uint32 promotion = 12; * @return this */ - public Equipment clearLevel() { + public Equipment clearPromotion() { bitField0_ &= ~0x00000020; - level = 0; + promotion = 0; return this; } /** - * optional uint32 level = 13; - * @return the level + * optional uint32 promotion = 12; + * @return the promotion */ - public int getLevel() { - return level; + public int getPromotion() { + return promotion; } /** - * optional uint32 level = 13; - * @param value the level to set + * optional uint32 promotion = 12; + * @param value the promotion to set * @return this */ - public Equipment setLevel(final int value) { + public Equipment setPromotion(final int value) { bitField0_ |= 0x00000020; - level = value; + promotion = value; return this; } /** - * optional uint32 tid = 14; + * optional uint32 tid = 13; * @return whether the tid field is set */ public boolean hasTid() { @@ -299,7 +299,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 tid = 14; + * optional uint32 tid = 13; * @return this */ public Equipment clearTid() { @@ -309,7 +309,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 tid = 14; + * optional uint32 tid = 13; * @return the tid */ public int getTid() { @@ -317,7 +317,7 @@ public final class EquipmentOuterClass { } /** - * optional uint32 tid = 14; + * optional uint32 tid = 13; * @param value the tid to set * @return this */ @@ -328,7 +328,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 15; + * optional bool is_protected = 14; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -336,7 +336,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 15; + * optional bool is_protected = 14; * @return this */ public Equipment clearIsProtected() { @@ -346,7 +346,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 15; + * optional bool is_protected = 14; * @return the isProtected */ public boolean getIsProtected() { @@ -354,7 +354,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 15; + * optional bool is_protected = 14; * @param value the isProtected to set * @return this */ @@ -369,12 +369,12 @@ public final class EquipmentOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - promotion = other.promotion; - rank = other.rank; equipAvatarId = other.equipAvatarId; + level = other.level; + rank = other.rank; uniqueId = other.uniqueId; exp = other.exp; - level = other.level; + promotion = other.promotion; tid = other.tid; isProtected = other.isProtected; } @@ -387,23 +387,23 @@ public final class EquipmentOuterClass { return this; } cachedSize = -1; - if (other.hasPromotion()) { - setPromotion(other.promotion); + if (other.hasEquipAvatarId()) { + setEquipAvatarId(other.equipAvatarId); + } + if (other.hasLevel()) { + setLevel(other.level); } if (other.hasRank()) { setRank(other.rank); } - if (other.hasEquipAvatarId()) { - setEquipAvatarId(other.equipAvatarId); - } if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } if (other.hasExp()) { setExp(other.exp); } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasPromotion()) { + setPromotion(other.promotion); } if (other.hasTid()) { setTid(other.tid); @@ -421,12 +421,12 @@ public final class EquipmentOuterClass { } cachedSize = -1; bitField0_ = 0; - promotion = 0; - rank = 0; equipAvatarId = 0; + level = 0; + rank = 0; uniqueId = 0; exp = 0; - level = 0; + promotion = 0; tid = 0; isProtected = false; return this; @@ -452,12 +452,12 @@ public final class EquipmentOuterClass { } Equipment other = (Equipment) o; return bitField0_ == other.bitField0_ - && (!hasPromotion() || promotion == other.promotion) - && (!hasRank() || rank == other.rank) && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) + && (!hasLevel() || level == other.level) + && (!hasRank() || rank == other.rank) && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasExp() || exp == other.exp) - && (!hasLevel() || level == other.level) + && (!hasPromotion() || promotion == other.promotion) && (!hasTid() || tid == other.tid) && (!hasIsProtected() || isProtected == other.isProtected); } @@ -465,35 +465,35 @@ public final class EquipmentOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(promotion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(rank); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(equipAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 48); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(rank); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(uniqueId); } 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) 96); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeBoolNoTag(isProtected); } } @@ -502,13 +502,13 @@ public final class EquipmentOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); @@ -517,7 +517,7 @@ public final class EquipmentOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); @@ -535,70 +535,70 @@ public final class EquipmentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { + case 40: { // equipAvatarId equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 48) { break; } } case 48: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { // uniqueId uniqueId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { + case 80: { // exp exp = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // promotion + promotion = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000020; + // tid + tid = input.readUInt32(); + bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 112) { break; } } case 112: { - // tid - tid = input.readUInt32(); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000080; @@ -625,13 +625,13 @@ public final class EquipmentOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.uniqueId, uniqueId); @@ -640,7 +640,7 @@ public final class EquipmentOuterClass { output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000040) != 0) { output.writeUInt32(FieldNames.tid, tid); @@ -658,10 +658,11 @@ public final class EquipmentOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { + case 169047204: + case 33057906: { + if (input.isAtField(FieldNames.equipAvatarId)) { if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); + equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -669,22 +670,21 @@ 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 3492908: { if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { rank = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 169047204: - case 33057906: { - if (input.isAtField(FieldNames.equipAvatarId)) { - if (!input.trySkipNullValue()) { - equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -715,10 +715,10 @@ public final class EquipmentOuterClass { } 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 { @@ -801,17 +801,17 @@ public final class EquipmentOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); + + static final FieldName level = FieldName.forField("level"); static final FieldName rank = FieldName.forField("rank"); - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); static final FieldName exp = FieldName.forField("exp"); - static final FieldName level = FieldName.forField("level"); + static final FieldName promotion = FieldName.forField("promotion"); static final FieldName tid = FieldName.forField("tid"); diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java index 1e50324..eeea9ad 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class ExchangeGachaCeilingCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 11; - */ - private int avatarId; - - /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 3; */ private int gachaType; + /** + * optional uint32 avatar_id = 13; + */ + private int avatarId; + private ExchangeGachaCeilingCsReq() { } @@ -39,62 +39,25 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 11; - * @return whether the avatarId field is set + * optional uint32 gacha_type = 3; + * @return whether the gachaType field is set */ - public boolean hasAvatarId() { + public boolean hasGachaType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 11; - * @return this - */ - public ExchangeGachaCeilingCsReq 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 ExchangeGachaCeilingCsReq setAvatarId(final int value) { - bitField0_ |= 0x00000001; - avatarId = value; - return this; - } - - /** - * optional uint32 gacha_type = 14; - * @return whether the gachaType field is set - */ - public boolean hasGachaType() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 3; * @return this */ public ExchangeGachaCeilingCsReq clearGachaType() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; gachaType = 0; return this; } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 3; * @return the gachaType */ public int getGachaType() { @@ -102,23 +65,60 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 3; * @param value the gachaType to set * @return this */ public ExchangeGachaCeilingCsReq setGachaType(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; gachaType = value; return this; } + /** + * optional uint32 avatar_id = 13; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 avatar_id = 13; + * @return this + */ + public ExchangeGachaCeilingCsReq clearAvatarId() { + bitField0_ &= ~0x00000002; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 13; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 13; + * @param value the avatarId to set + * @return this + */ + public ExchangeGachaCeilingCsReq setAvatarId(final int value) { + bitField0_ |= 0x00000002; + avatarId = value; + return this; + } + @Override public ExchangeGachaCeilingCsReq copyFrom(final ExchangeGachaCeilingCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - avatarId = other.avatarId; gachaType = other.gachaType; + avatarId = other.avatarId; } return this; } @@ -129,12 +129,12 @@ public final class ExchangeGachaCeilingCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasAvatarId()) { - setAvatarId(other.avatarId); - } if (other.hasGachaType()) { setGachaType(other.gachaType); } + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } return this; } @@ -145,8 +145,8 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - avatarId = 0; gachaType = 0; + avatarId = 0; return this; } @@ -170,19 +170,19 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } ExchangeGachaCeilingCsReq other = (ExchangeGachaCeilingCsReq) o; return bitField0_ == other.bitField0_ - && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasGachaType() || gachaType == other.gachaType); + && (!hasGachaType() || gachaType == other.gachaType) + && (!hasAvatarId() || avatarId == other.avatarId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(gachaType); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(avatarId); } } @@ -190,10 +190,10 @@ public final class ExchangeGachaCeilingCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } return size; } @@ -205,18 +205,18 @@ public final class ExchangeGachaCeilingCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // avatarId - avatarId = input.readUInt32(); + case 24: { + // gachaType + gachaType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // gachaType - gachaType = input.readUInt32(); + case 104: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ExchangeGachaCeilingCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.gachaType, gachaType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gachaType, gachaType); + output.writeUInt32(FieldNames.avatarId, avatarId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { + case 802848732: + case -871474217: { + if (input.isAtField(FieldNames.gachaType)) { if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); + gachaType = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } break; } - case 802848732: - case -871474217: { - if (input.isAtField(FieldNames.gachaType)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - gachaType = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class ExchangeGachaCeilingCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type"); + + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java index ac9461f..cd00ae3 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java @@ -24,22 +24,22 @@ public final class ExchangeGachaCeilingScRspOuterClass { private int avatarId; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 14; */ private int gachaType; /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_item_list = 10; */ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 15; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); @@ -91,7 +91,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -99,7 +99,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return this */ public ExchangeGachaCeilingScRsp clearRetcode() { @@ -109,7 +109,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -117,7 +117,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -128,7 +128,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 14; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -136,7 +136,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 14; * @return this */ public ExchangeGachaCeilingScRsp clearGachaType() { @@ -146,7 +146,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 14; * @return the gachaType */ public int getGachaType() { @@ -154,7 +154,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 14; * @param value the gachaType to set * @return this */ @@ -165,7 +165,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_item_list = 10; * @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 = 10; * @return this */ public ExchangeGachaCeilingScRsp clearTransferItemList() { @@ -183,7 +183,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_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. @@ -197,7 +197,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_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 @@ -211,7 +211,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_item_list = 10; * @param value the transferItemList to set * @return this */ @@ -222,7 +222,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 15; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -230,7 +230,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 15; * @return this */ public ExchangeGachaCeilingScRsp clearGachaCeiling() { @@ -240,7 +240,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 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. @@ -254,7 +254,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 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 @@ -268,7 +268,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 15; * @param value the gachaCeiling to set * @return this */ @@ -368,19 +368,19 @@ public final class ExchangeGachaCeilingScRspOuterClass { output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 82); output.writeMessageNoTag(transferItemList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeMessageNoTag(gachaCeiling); } } @@ -418,38 +418,38 @@ public final class ExchangeGachaCeilingScRspOuterClass { avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 32) { break; } } - case 24: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 112) { break; } } - case 40: { + case 112: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + case 82: { // transferItemList input.readMessage(transferItemList); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 74) { + if (tag != 122) { break; } } - case 74: { + case 122: { // gachaCeiling input.readMessage(gachaCeiling); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java index cf9fd01..d6205a3 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class ExchangeHcoinCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 num = 5; + * optional uint32 num = 14; */ private int num; @@ -34,7 +34,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 5; + * optional uint32 num = 14; * @return whether the num field is set */ public boolean hasNum() { @@ -42,7 +42,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 5; + * optional uint32 num = 14; * @return this */ public ExchangeHcoinCsReq clearNum() { @@ -52,7 +52,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 5; + * optional uint32 num = 14; * @return the num */ public int getNum() { @@ -60,7 +60,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 5; + * optional uint32 num = 14; * @param value the num to set * @return this */ @@ -129,7 +129,7 @@ public final class ExchangeHcoinCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(num); } } @@ -150,7 +150,7 @@ public final class ExchangeHcoinCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 112: { // num num = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java index fe7241d..8dea3d9 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java @@ -18,16 +18,16 @@ public final class ExchangeHcoinScRspOuterClass { public static final class ExchangeHcoinScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 retcode = 3; + */ + private int retcode; + /** * optional uint32 num = 4; */ private int num; - /** - * optional uint32 retcode = 12; - */ - private int retcode; - private ExchangeHcoinScRsp() { } @@ -38,12 +38,49 @@ public final class ExchangeHcoinScRspOuterClass { return new ExchangeHcoinScRsp(); } + /** + * 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 ExchangeHcoinScRsp 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 ExchangeHcoinScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + /** * optional uint32 num = 4; * @return whether the num field is set */ public boolean hasNum() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -51,7 +88,7 @@ public final class ExchangeHcoinScRspOuterClass { * @return this */ public ExchangeHcoinScRsp clearNum() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; num = 0; return this; } @@ -70,45 +107,8 @@ public final class ExchangeHcoinScRspOuterClass { * @return this */ public ExchangeHcoinScRsp setNum(final int value) { - bitField0_ |= 0x00000001; - num = value; - return this; - } - - /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 12; - * @return this - */ - public ExchangeHcoinScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 12; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 12; - * @param value the retcode to set - * @return this - */ - public ExchangeHcoinScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - retcode = value; + num = value; return this; } @@ -117,8 +117,8 @@ public final class ExchangeHcoinScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - num = other.num; retcode = other.retcode; + num = other.num; } return this; } @@ -129,12 +129,12 @@ public final class ExchangeHcoinScRspOuterClass { return this; } cachedSize = -1; - if (other.hasNum()) { - setNum(other.num); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasNum()) { + setNum(other.num); + } return this; } @@ -145,8 +145,8 @@ public final class ExchangeHcoinScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - num = 0; retcode = 0; + num = 0; return this; } @@ -170,19 +170,19 @@ public final class ExchangeHcoinScRspOuterClass { } ExchangeHcoinScRsp other = (ExchangeHcoinScRsp) o; return bitField0_ == other.bitField0_ - && (!hasNum() || num == other.num) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasNum() || num == other.num); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(num); } } @@ -190,10 +190,10 @@ public final class ExchangeHcoinScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } return size; } @@ -205,18 +205,18 @@ public final class ExchangeHcoinScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // num - num = input.readUInt32(); + case 24: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 32) { break; } } - case 96: { - // retcode - retcode = input.readUInt32(); + case 32: { + // num + num = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ExchangeHcoinScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.num, num); } output.endObject(); } @@ -256,10 +256,10 @@ public final class ExchangeHcoinScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109446: { - if (input.isAtField(FieldNames.num)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class ExchangeHcoinScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class ExchangeHcoinScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName num = FieldName.forField("num"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName num = FieldName.forField("num"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java index 2227458..0dbc423 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 = 5; + * optional uint32 equipment_unique_id = 8; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 12; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 5; + * optional uint32 equipment_unique_id = 8; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 5; + * optional uint32 equipment_unique_id = 8; * @return this */ public ExpUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 5; + * optional uint32 equipment_unique_id = 8; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 5; + * optional uint32 equipment_unique_id = 8; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 12; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 12; * @return this */ public ExpUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * 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 ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * 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 ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 12; * @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) 40); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 98); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 64: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 98) { break; } } - case 10: { + case 98: { // 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 8672f0f..6bcef88 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 = 1; + * optional uint32 retcode = 15; */ private int retcode; /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 5; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @return this */ public ExpUpEquipmentScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 5; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 5; * @return this */ public ExpUpEquipmentScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * 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 ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * 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 ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 5; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 5; * @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) 8); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 42); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class ExpUpEquipmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 42) { break; } } - case 82: { + case 42: { // 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 f3065e3..0f16934 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 = 15; + * optional uint32 relic_unique_id = 11; */ private int relicUniqueId; /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 7; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 15; + * 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 = 15; + * optional uint32 relic_unique_id = 11; * @return this */ public ExpUpRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 15; + * 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 = 15; + * 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 = 13; + * optional .ItemCostList item_cost_list = 7; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 7; * @return this */ public ExpUpRelicCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 7; * @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) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 58); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 88: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 58) { break; } } - case 106: { + case 58: { // 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 7653038..90345e4 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 = 3; + * optional uint32 retcode = 11; */ private int retcode; /** - * repeated .PileItem return_item_list = 6; + * 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 = 3; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @return this */ public ExpUpRelicScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 6; + * 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 = 6; + * repeated .PileItem return_item_list = 10; * @return this */ public ExpUpRelicScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 6; + * 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 = 6; + * 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 = 6; + * 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 = 6; + * 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) 24); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 50); + 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 24: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 82) { break; } } - case 50: { + case 82: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExtraLineupTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExtraLineupTypeOuterClass.java index c9e851c..68baee8 100644 --- a/src/generated/main/emu/lunarcore/proto/ExtraLineupTypeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExtraLineupTypeOuterClass.java @@ -167,7 +167,7 @@ public final class ExtraLineupTypeOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return ExtraLineupTypeConverter.INSTANCE; } @@ -189,7 +189,7 @@ public final class ExtraLineupTypeOuterClass { return value == null ? other : value; } - enum ExtraLineupTypeConverter implements EnumConverter { + enum ExtraLineupTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final ExtraLineupType[] lookup = new ExtraLineupType[14]; diff --git a/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java index 115fe36..9f5d6db 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 = 7; + * optional int64 begin_time = 5; */ private long beginTime; /** - * optional int64 end_time = 12; + * optional int64 end_time = 6; */ private long endTime; /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 7; */ private int gachaId; @@ -44,7 +44,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 begin_time = 7; + * optional int64 begin_time = 5; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -52,7 +52,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 begin_time = 7; + * optional int64 begin_time = 5; * @return this */ public FarmStageGachaInfo clearBeginTime() { @@ -62,7 +62,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 begin_time = 7; + * optional int64 begin_time = 5; * @return the beginTime */ public long getBeginTime() { @@ -70,7 +70,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 begin_time = 7; + * optional int64 begin_time = 5; * @param value the beginTime to set * @return this */ @@ -81,7 +81,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 end_time = 12; + * optional int64 end_time = 6; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -89,7 +89,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 end_time = 12; + * optional int64 end_time = 6; * @return this */ public FarmStageGachaInfo clearEndTime() { @@ -99,7 +99,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 end_time = 12; + * optional int64 end_time = 6; * @return the endTime */ public long getEndTime() { @@ -107,7 +107,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 end_time = 12; + * optional int64 end_time = 6; * @param value the endTime to set * @return this */ @@ -118,7 +118,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 7; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -126,7 +126,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 7; * @return this */ public FarmStageGachaInfo clearGachaId() { @@ -136,7 +136,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 7; * @return the gachaId */ public int getGachaId() { @@ -144,7 +144,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 7; * @param value the gachaId to set * @return this */ @@ -225,15 +225,15 @@ public final class FarmStageGachaInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 48); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(gachaId); } } @@ -260,25 +260,25 @@ public final class FarmStageGachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 40: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 48) { break; } } - case 96: { + case 48: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { + case 56: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/FinishRogueCommonDialogueCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishRogueCommonDialogueCsReqOuterClass.java index f753a9f..cd144f7 100644 --- a/src/generated/main/emu/lunarcore/proto/FinishRogueCommonDialogueCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FinishRogueCommonDialogueCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class FinishRogueCommonDialogueCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_unique_id = 9; + * optional uint32 event_unique_id = 3; */ private int eventUniqueId; @@ -34,7 +34,7 @@ public final class FinishRogueCommonDialogueCsReqOuterClass { } /** - * optional uint32 event_unique_id = 9; + * optional uint32 event_unique_id = 3; * @return whether the eventUniqueId field is set */ public boolean hasEventUniqueId() { @@ -42,7 +42,7 @@ public final class FinishRogueCommonDialogueCsReqOuterClass { } /** - * optional uint32 event_unique_id = 9; + * optional uint32 event_unique_id = 3; * @return this */ public FinishRogueCommonDialogueCsReq clearEventUniqueId() { @@ -52,7 +52,7 @@ public final class FinishRogueCommonDialogueCsReqOuterClass { } /** - * optional uint32 event_unique_id = 9; + * optional uint32 event_unique_id = 3; * @return the eventUniqueId */ public int getEventUniqueId() { @@ -60,7 +60,7 @@ public final class FinishRogueCommonDialogueCsReqOuterClass { } /** - * optional uint32 event_unique_id = 9; + * optional uint32 event_unique_id = 3; * @param value the eventUniqueId to set * @return this */ @@ -129,7 +129,7 @@ public final class FinishRogueCommonDialogueCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(eventUniqueId); } } @@ -150,7 +150,7 @@ public final class FinishRogueCommonDialogueCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 24: { // eventUniqueId eventUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/FinishRogueCommonDialogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishRogueCommonDialogueScRspOuterClass.java index d742f92..0f3500d 100644 --- a/src/generated/main/emu/lunarcore/proto/FinishRogueCommonDialogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FinishRogueCommonDialogueScRspOuterClass.java @@ -19,15 +19,15 @@ public final class FinishRogueCommonDialogueScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; - */ - private int retcode; - - /** - * optional uint32 event_unique_id = 13; + * optional uint32 event_unique_id = 3; */ private int eventUniqueId; + /** + * optional uint32 retcode = 13; + */ + private int retcode; + private FinishRogueCommonDialogueScRsp() { } @@ -39,62 +39,25 @@ public final class FinishRogueCommonDialogueScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 event_unique_id = 3; + * @return whether the eventUniqueId field is set */ - public boolean hasRetcode() { + public boolean hasEventUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public FinishRogueCommonDialogueScRsp 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 FinishRogueCommonDialogueScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 event_unique_id = 13; - * @return whether the eventUniqueId field is set - */ - public boolean hasEventUniqueId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 event_unique_id = 13; + * optional uint32 event_unique_id = 3; * @return this */ public FinishRogueCommonDialogueScRsp clearEventUniqueId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; eventUniqueId = 0; return this; } /** - * optional uint32 event_unique_id = 13; + * optional uint32 event_unique_id = 3; * @return the eventUniqueId */ public int getEventUniqueId() { @@ -102,23 +65,60 @@ public final class FinishRogueCommonDialogueScRspOuterClass { } /** - * optional uint32 event_unique_id = 13; + * optional uint32 event_unique_id = 3; * @param value the eventUniqueId to set * @return this */ public FinishRogueCommonDialogueScRsp setEventUniqueId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; eventUniqueId = value; return this; } + /** + * optional uint32 retcode = 13; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 13; + * @return this + */ + public FinishRogueCommonDialogueScRsp 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 FinishRogueCommonDialogueScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public FinishRogueCommonDialogueScRsp copyFrom(final FinishRogueCommonDialogueScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; eventUniqueId = other.eventUniqueId; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class FinishRogueCommonDialogueScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasEventUniqueId()) { setEventUniqueId(other.eventUniqueId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class FinishRogueCommonDialogueScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; eventUniqueId = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class FinishRogueCommonDialogueScRspOuterClass { } FinishRogueCommonDialogueScRsp other = (FinishRogueCommonDialogueScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId); + && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId) + && (!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(eventUniqueId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(eventUniqueId); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class FinishRogueCommonDialogueScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,9 +205,9 @@ public final class FinishRogueCommonDialogueScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // retcode - retcode = input.readUInt32(); + case 24: { + // eventUniqueId + eventUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 104) { @@ -215,8 +215,8 @@ public final class FinishRogueCommonDialogueScRspOuterClass { } } case 104: { - // eventUniqueId - eventUniqueId = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class FinishRogueCommonDialogueScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public final class FinishRogueCommonDialogueScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 2091680134: + case -157385500: { + if (input.isAtField(FieldNames.eventUniqueId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + eventUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class FinishRogueCommonDialogueScRspOuterClass { } break; } - case 2091680134: - case -157385500: { - if (input.isAtField(FieldNames.eventUniqueId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - eventUniqueId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -334,9 +334,9 @@ public final class FinishRogueCommonDialogueScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java index 4491678..8682cfd 100644 --- a/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java @@ -21,17 +21,17 @@ public final class FinishTalkMissionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 sub_mission_id = 15; + * optional uint32 sub_mission_id = 14; */ private int subMissionId; /** - * optional string talk_str = 1; + * optional string talk_str = 7; */ private final Utf8String talkStr = Utf8String.newEmptyInstance(); /** - * repeated .MissionCustomValueData custom_value_list = 9; + * repeated .MissionCustomValueData custom_value_list = 10; */ private final RepeatedMessage customValueList = RepeatedMessage.newEmptyInstance(MissionCustomValueDataOuterClass.MissionCustomValueData.getFactory()); @@ -46,7 +46,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional uint32 sub_mission_id = 15; + * optional uint32 sub_mission_id = 14; * @return whether the subMissionId field is set */ public boolean hasSubMissionId() { @@ -54,7 +54,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional uint32 sub_mission_id = 15; + * optional uint32 sub_mission_id = 14; * @return this */ public FinishTalkMissionCsReq clearSubMissionId() { @@ -64,7 +64,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional uint32 sub_mission_id = 15; + * optional uint32 sub_mission_id = 14; * @return the subMissionId */ public int getSubMissionId() { @@ -72,7 +72,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional uint32 sub_mission_id = 15; + * optional uint32 sub_mission_id = 14; * @param value the subMissionId to set * @return this */ @@ -83,7 +83,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 1; + * optional string talk_str = 7; * @return whether the talkStr field is set */ public boolean hasTalkStr() { @@ -91,7 +91,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 1; + * optional string talk_str = 7; * @return this */ public FinishTalkMissionCsReq clearTalkStr() { @@ -101,7 +101,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 1; + * optional string talk_str = 7; * @return the talkStr */ public String getTalkStr() { @@ -109,7 +109,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 1; + * optional string talk_str = 7; * @return internal {@code Utf8String} representation of talkStr for reading */ public Utf8String getTalkStrBytes() { @@ -117,7 +117,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 1; + * optional string talk_str = 7; * @return internal {@code Utf8String} representation of talkStr for modifications */ public Utf8String getMutableTalkStrBytes() { @@ -126,7 +126,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 1; + * optional string talk_str = 7; * @param value the talkStr to set * @return this */ @@ -137,7 +137,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 1; + * optional string talk_str = 7; * @param value the talkStr to set * @return this */ @@ -148,7 +148,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 9; + * repeated .MissionCustomValueData custom_value_list = 10; * @return whether the customValueList field is set */ public boolean hasCustomValueList() { @@ -156,7 +156,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 9; + * repeated .MissionCustomValueData custom_value_list = 10; * @return this */ public FinishTalkMissionCsReq clearCustomValueList() { @@ -166,7 +166,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 9; + * repeated .MissionCustomValueData custom_value_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. @@ -181,7 +181,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 9; + * repeated .MissionCustomValueData custom_value_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 @@ -196,7 +196,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 9; + * repeated .MissionCustomValueData custom_value_list = 10; * @param value the customValueList to add * @return this */ @@ -208,7 +208,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 9; + * repeated .MissionCustomValueData custom_value_list = 10; * @param values the customValueList to add * @return this */ @@ -292,16 +292,16 @@ public final class FinishTalkMissionCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(subMissionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 58); output.writeStringNoTag(talkStr); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < customValueList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 82); output.writeMessageNoTag(customValueList.get(i)); } } @@ -329,25 +329,25 @@ public final class FinishTalkMissionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 112: { // subMissionId subMissionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 58) { break; } } - case 10: { + case 58: { // talkStr input.readString(talkStr); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 82) { break; } } - case 74: { + case 82: { // customValueList tag = input.readRepeatedMessage(customValueList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java index bc1a16e..bc2bf57 100644 --- a/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java @@ -21,12 +21,12 @@ public final class FinishTalkMissionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional uint32 sub_mission_id = 13; + * optional uint32 sub_mission_id = 10; */ private int subMissionId; @@ -36,7 +36,7 @@ public final class FinishTalkMissionScRspOuterClass { private final Utf8String talkStr = Utf8String.newEmptyInstance(); /** - * repeated .MissionCustomValueData custom_value_list = 12; + * repeated .MissionCustomValueData custom_value_list = 4; */ private final RepeatedMessage customValueList = RepeatedMessage.newEmptyInstance(MissionCustomValueDataOuterClass.MissionCustomValueData.getFactory()); @@ -51,7 +51,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -59,7 +59,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 8; * @return this */ public FinishTalkMissionScRsp clearRetcode() { @@ -69,7 +69,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -77,7 +77,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -88,7 +88,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 sub_mission_id = 13; + * optional uint32 sub_mission_id = 10; * @return whether the subMissionId field is set */ public boolean hasSubMissionId() { @@ -96,7 +96,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 sub_mission_id = 13; + * optional uint32 sub_mission_id = 10; * @return this */ public FinishTalkMissionScRsp clearSubMissionId() { @@ -106,7 +106,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 sub_mission_id = 13; + * optional uint32 sub_mission_id = 10; * @return the subMissionId */ public int getSubMissionId() { @@ -114,7 +114,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 sub_mission_id = 13; + * optional uint32 sub_mission_id = 10; * @param value the subMissionId to set * @return this */ @@ -190,7 +190,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 12; + * repeated .MissionCustomValueData custom_value_list = 4; * @return whether the customValueList field is set */ public boolean hasCustomValueList() { @@ -198,7 +198,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 12; + * repeated .MissionCustomValueData custom_value_list = 4; * @return this */ public FinishTalkMissionScRsp clearCustomValueList() { @@ -208,7 +208,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 12; + * repeated .MissionCustomValueData custom_value_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. @@ -223,7 +223,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 12; + * repeated .MissionCustomValueData custom_value_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 @@ -238,7 +238,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 12; + * repeated .MissionCustomValueData custom_value_list = 4; * @param value the customValueList to add * @return this */ @@ -250,7 +250,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 12; + * repeated .MissionCustomValueData custom_value_list = 4; * @param values the customValueList to add * @return this */ @@ -340,11 +340,11 @@ public final class FinishTalkMissionScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(subMissionId); } if ((bitField0_ & 0x00000004) != 0) { @@ -353,7 +353,7 @@ public final class FinishTalkMissionScRspOuterClass { } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < customValueList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(customValueList.get(i)); } } @@ -384,16 +384,16 @@ public final class FinishTalkMissionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { + case 80: { // subMissionId subMissionId = input.readUInt32(); bitField0_ |= 0x00000002; @@ -407,11 +407,11 @@ public final class FinishTalkMissionScRspOuterClass { input.readString(talkStr); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 34) { break; } } - case 98: { + case 34: { // customValueList tag = input.readRepeatedMessage(customValueList, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java index 493cba1..3458932 100644 --- a/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java @@ -19,12 +19,12 @@ public final class FirstNpcTalkInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 10; */ private int npcId; /** - * optional bool unk_bool = 14; + * optional bool unk_bool = 1; */ private boolean unkBool; @@ -39,7 +39,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 10; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -47,7 +47,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 10; * @return this */ public FirstNpcTalkInfo clearNpcId() { @@ -57,7 +57,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 10; * @return the npcId */ public int getNpcId() { @@ -65,7 +65,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional uint32 npc_id = 6; + * optional uint32 npc_id = 10; * @param value the npcId to set * @return this */ @@ -76,7 +76,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional bool unk_bool = 14; + * optional bool unk_bool = 1; * @return whether the unkBool field is set */ public boolean hasUnkBool() { @@ -84,7 +84,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional bool unk_bool = 14; + * optional bool unk_bool = 1; * @return this */ public FirstNpcTalkInfo clearUnkBool() { @@ -94,7 +94,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional bool unk_bool = 14; + * optional bool unk_bool = 1; * @return the unkBool */ public boolean getUnkBool() { @@ -102,7 +102,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional bool unk_bool = 14; + * optional bool unk_bool = 1; * @param value the unkBool to set * @return this */ @@ -177,11 +177,11 @@ public final class FirstNpcTalkInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 8); output.writeBoolNoTag(unkBool); } } @@ -205,16 +205,16 @@ public final class FirstNpcTalkInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 80: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 8) { break; } } - case 112: { + case 8: { // unkBool unkBool = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java index 4eab1f8..1dd52d4 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 = 9; + * optional .SimpleInfo simple_info = 7; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 7; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 7; * @return this */ public FriendApplyInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 7; * @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) 74); + output.writeRawByte((byte) 58); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendApplyInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 58: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/FriendApplySourceOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendApplySourceOuterClass.java index 03c3b32..d68f888 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendApplySourceOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendApplySourceOuterClass.java @@ -97,7 +97,7 @@ public final class FriendApplySourceOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return FriendApplySourceConverter.INSTANCE; } @@ -119,7 +119,7 @@ public final class FriendApplySourceOuterClass { return value == null ? other : value; } - enum FriendApplySourceConverter implements EnumConverter { + enum FriendApplySourceConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final FriendApplySource[] lookup = new FriendApplySource[6]; diff --git a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java index 6318869..8dd2c4b 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java @@ -20,17 +20,17 @@ public final class FriendListInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .PlayingState playing_state = 14; + * optional .PlayingState playing_state = 3; */ private int playingState; /** - * optional bool is_marked = 8; + * optional bool is_marked = 4; */ private boolean isMarked; /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 2; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -50,7 +50,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 14; + * optional .PlayingState playing_state = 3; * @return whether the playingState field is set */ public boolean hasPlayingState() { @@ -58,7 +58,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 14; + * optional .PlayingState playing_state = 3; * @return this */ public FriendListInfo clearPlayingState() { @@ -68,7 +68,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 14; + * optional .PlayingState playing_state = 3; * @return the playingState */ public PlayingStateOuterClass.PlayingState getPlayingState() { @@ -101,7 +101,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 14; + * optional .PlayingState playing_state = 3; * @param value the playingState to set * @return this */ @@ -112,7 +112,7 @@ public final class FriendListInfoOuterClass { } /** - * optional bool is_marked = 8; + * optional bool is_marked = 4; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -120,7 +120,7 @@ public final class FriendListInfoOuterClass { } /** - * optional bool is_marked = 8; + * optional bool is_marked = 4; * @return this */ public FriendListInfo clearIsMarked() { @@ -130,7 +130,7 @@ public final class FriendListInfoOuterClass { } /** - * optional bool is_marked = 8; + * optional bool is_marked = 4; * @return the isMarked */ public boolean getIsMarked() { @@ -138,7 +138,7 @@ public final class FriendListInfoOuterClass { } /** - * optional bool is_marked = 8; + * optional bool is_marked = 4; * @param value the isMarked to set * @return this */ @@ -149,7 +149,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 2; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -157,7 +157,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 2; * @return this */ public FriendListInfo clearSimpleInfo() { @@ -167,7 +167,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * 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. @@ -181,7 +181,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * 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 @@ -195,7 +195,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 2; * @param value the simpleInfo to set * @return this */ @@ -349,15 +349,15 @@ public final class FriendListInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 24); output.writeEnumNoTag(playingState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isMarked); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(simpleInfo); } if ((bitField0_ & 0x00000008) != 0) { @@ -391,7 +391,7 @@ public final class FriendListInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 24: { // playingState final int value = input.readInt32(); if (PlayingStateOuterClass.PlayingState.forNumber(value) != null) { @@ -399,20 +399,20 @@ public final class FriendListInfoOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { + case 32: { // isMarked isMarked = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { + case 18: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/FriendOnlineStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendOnlineStatusOuterClass.java index 1c15933..8ffc47c 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendOnlineStatusOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendOnlineStatusOuterClass.java @@ -57,7 +57,7 @@ public final class FriendOnlineStatusOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return FriendOnlineStatusConverter.INSTANCE; } @@ -79,7 +79,7 @@ public final class FriendOnlineStatusOuterClass { return value == null ? other : value; } - enum FriendOnlineStatusConverter implements EnumConverter { + enum FriendOnlineStatusConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final FriendOnlineStatus[] lookup = new FriendOnlineStatus[2]; diff --git a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java index 508bc53..c6633fd 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 = 10; + * optional .SimpleInfo simple_info = 14; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 14; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 14; * @return this */ public FriendRecommendInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 14; * @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) 82); + output.writeRawByte((byte) 114); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendRecommendInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 114: { // 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 120bb00..448b643 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 avatar_id = 12; - */ - private int avatarId; - - /** - * optional uint32 repeated_cnt = 13; + * optional uint32 repeated_cnt = 5; */ private int repeatedCnt; + /** + * optional uint32 avatar_id = 14; + */ + private int avatarId; + private GachaCeilingAvatar() { } @@ -39,62 +39,25 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 avatar_id = 12; - * @return whether the avatarId field is set + * optional uint32 repeated_cnt = 5; + * @return whether the repeatedCnt field is set */ - public boolean hasAvatarId() { + public boolean hasRepeatedCnt() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 12; - * @return this - */ - public GachaCeilingAvatar clearAvatarId() { - bitField0_ &= ~0x00000001; - 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 GachaCeilingAvatar setAvatarId(final int value) { - bitField0_ |= 0x00000001; - avatarId = value; - return this; - } - - /** - * optional uint32 repeated_cnt = 13; - * @return whether the repeatedCnt field is set - */ - public boolean hasRepeatedCnt() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 repeated_cnt = 13; + * optional uint32 repeated_cnt = 5; * @return this */ public GachaCeilingAvatar clearRepeatedCnt() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; repeatedCnt = 0; return this; } /** - * optional uint32 repeated_cnt = 13; + * optional uint32 repeated_cnt = 5; * @return the repeatedCnt */ public int getRepeatedCnt() { @@ -102,23 +65,60 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 repeated_cnt = 13; + * optional uint32 repeated_cnt = 5; * @param value the repeatedCnt to set * @return this */ public GachaCeilingAvatar setRepeatedCnt(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; repeatedCnt = value; return this; } + /** + * optional uint32 avatar_id = 14; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 avatar_id = 14; + * @return this + */ + public GachaCeilingAvatar clearAvatarId() { + bitField0_ &= ~0x00000002; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 14; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 14; + * @param value the avatarId to set + * @return this + */ + public GachaCeilingAvatar setAvatarId(final int value) { + bitField0_ |= 0x00000002; + avatarId = value; + return this; + } + @Override public GachaCeilingAvatar copyFrom(final GachaCeilingAvatar other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - avatarId = other.avatarId; repeatedCnt = other.repeatedCnt; + avatarId = other.avatarId; } return this; } @@ -129,12 +129,12 @@ public final class GachaCeilingAvatarOuterClass { return this; } cachedSize = -1; - if (other.hasAvatarId()) { - setAvatarId(other.avatarId); - } if (other.hasRepeatedCnt()) { setRepeatedCnt(other.repeatedCnt); } + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } return this; } @@ -145,8 +145,8 @@ public final class GachaCeilingAvatarOuterClass { } cachedSize = -1; bitField0_ = 0; - avatarId = 0; repeatedCnt = 0; + avatarId = 0; return this; } @@ -170,19 +170,19 @@ public final class GachaCeilingAvatarOuterClass { } GachaCeilingAvatar other = (GachaCeilingAvatar) o; return bitField0_ == other.bitField0_ - && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasRepeatedCnt() || repeatedCnt == other.repeatedCnt); + && (!hasRepeatedCnt() || repeatedCnt == other.repeatedCnt) + && (!hasAvatarId() || avatarId == other.avatarId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(repeatedCnt); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(repeatedCnt); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(avatarId); } } @@ -190,10 +190,10 @@ public final class GachaCeilingAvatarOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(repeatedCnt); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(repeatedCnt); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } return size; } @@ -205,18 +205,18 @@ public final class GachaCeilingAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // avatarId - avatarId = input.readUInt32(); + case 40: { + // repeatedCnt + repeatedCnt = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // repeatedCnt - repeatedCnt = input.readUInt32(); + case 112: { + // avatarId + avatarId = 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.avatarId, avatarId); + output.writeUInt32(FieldNames.repeatedCnt, repeatedCnt); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.repeatedCnt, repeatedCnt); + output.writeUInt32(FieldNames.avatarId, avatarId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class GachaCeilingAvatarOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class GachaCeilingAvatarOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class GachaCeilingAvatarOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - static final FieldName repeatedCnt = FieldName.forField("repeatedCnt", "repeated_cnt"); + + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java index e11f7cb..b067c55 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java @@ -20,12 +20,12 @@ public final class GachaCeilingOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 ceiling_num = 5; + * optional uint32 ceiling_num = 7; */ private int ceilingNum; /** - * optional bool is_claimed = 4; + * optional bool is_claimed = 15; */ private boolean isClaimed; @@ -45,7 +45,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 5; + * optional uint32 ceiling_num = 7; * @return whether the ceilingNum field is set */ public boolean hasCeilingNum() { @@ -53,7 +53,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 5; + * optional uint32 ceiling_num = 7; * @return this */ public GachaCeiling clearCeilingNum() { @@ -63,7 +63,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 5; + * optional uint32 ceiling_num = 7; * @return the ceilingNum */ public int getCeilingNum() { @@ -71,7 +71,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 5; + * optional uint32 ceiling_num = 7; * @param value the ceilingNum to set * @return this */ @@ -82,7 +82,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 4; + * optional bool is_claimed = 15; * @return whether the isClaimed field is set */ public boolean hasIsClaimed() { @@ -90,7 +90,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 4; + * optional bool is_claimed = 15; * @return this */ public GachaCeiling clearIsClaimed() { @@ -100,7 +100,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 4; + * optional bool is_claimed = 15; * @return the isClaimed */ public boolean getIsClaimed() { @@ -108,7 +108,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 4; + * optional bool is_claimed = 15; * @param value the isClaimed to set * @return this */ @@ -259,11 +259,11 @@ public final class GachaCeilingOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 120); output.writeBoolNoTag(isClaimed); } if ((bitField0_ & 0x00000004) != 0) { @@ -296,16 +296,16 @@ public final class GachaCeilingOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 56: { // ceilingNum ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 120) { break; } } - case 32: { + case 120: { // isClaimed isClaimed = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java index 4c1189c..fe4816b 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java @@ -21,7 +21,7 @@ public final class GachaInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 end_time = 1; + * optional int64 end_time = 5; */ private long endTime; @@ -31,32 +31,37 @@ public final class GachaInfoOuterClass { private long beginTime; /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 11; */ private int gachaId; /** - * optional .GachaCeiling gacha_ceiling = 10; + * optional uint32 current_gacha_time = 13; + */ + private int currentGachaTime; + + /** + * optional .GachaCeiling gacha_ceiling = 15; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); /** - * optional string history_url = 7; - */ - private final Utf8String historyUrl = Utf8String.newEmptyInstance(); - - /** - * optional string detail_url = 14; + * optional string detail_url = 9; */ private final Utf8String detailUrl = Utf8String.newEmptyInstance(); /** - * repeated uint32 up_info = 4; + * optional string history_url = 10; + */ + private final Utf8String historyUrl = Utf8String.newEmptyInstance(); + + /** + * repeated uint32 up_info = 2; */ private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 featured = 8; + * repeated uint32 featured = 4; */ private final RepeatedInt featured = RepeatedInt.newEmptyInstance(); @@ -71,7 +76,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 1; + * optional int64 end_time = 5; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -79,7 +84,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 1; + * optional int64 end_time = 5; * @return this */ public GachaInfo clearEndTime() { @@ -89,7 +94,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 1; + * optional int64 end_time = 5; * @return the endTime */ public long getEndTime() { @@ -97,7 +102,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 1; + * optional int64 end_time = 5; * @param value the endTime to set * @return this */ @@ -145,7 +150,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 11; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -153,7 +158,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 11; * @return this */ public GachaInfo clearGachaId() { @@ -163,7 +168,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 11; * @return the gachaId */ public int getGachaId() { @@ -171,7 +176,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 11; * @param value the gachaId to set * @return this */ @@ -182,25 +187,62 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 10; - * @return whether the gachaCeiling field is set + * optional uint32 current_gacha_time = 13; + * @return whether the currentGachaTime field is set */ - public boolean hasGachaCeiling() { + public boolean hasCurrentGachaTime() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .GachaCeiling gacha_ceiling = 10; + * optional uint32 current_gacha_time = 13; + * @return this + */ + public GachaInfo clearCurrentGachaTime() { + bitField0_ &= ~0x00000008; + currentGachaTime = 0; + return this; + } + + /** + * optional uint32 current_gacha_time = 13; + * @return the currentGachaTime + */ + public int getCurrentGachaTime() { + return currentGachaTime; + } + + /** + * optional uint32 current_gacha_time = 13; + * @param value the currentGachaTime to set + * @return this + */ + public GachaInfo setCurrentGachaTime(final int value) { + bitField0_ |= 0x00000008; + currentGachaTime = value; + return this; + } + + /** + * optional .GachaCeiling gacha_ceiling = 15; + * @return whether the gachaCeiling field is set + */ + public boolean hasGachaCeiling() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .GachaCeiling gacha_ceiling = 15; * @return this */ public GachaInfo clearGachaCeiling() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000010; gachaCeiling.clear(); return this; } /** - * optional .GachaCeiling gacha_ceiling = 10; + * optional .GachaCeiling gacha_ceiling = 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. @@ -214,7 +256,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 10; + * optional .GachaCeiling gacha_ceiling = 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 @@ -223,88 +265,23 @@ public final class GachaInfoOuterClass { * @return internal storage object for modifications */ public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return gachaCeiling; } /** - * optional .GachaCeiling gacha_ceiling = 10; + * optional .GachaCeiling gacha_ceiling = 15; * @param value the gachaCeiling to set * @return this */ public GachaInfo setGachaCeiling(final GachaCeilingOuterClass.GachaCeiling value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; gachaCeiling.copyFrom(value); return this; } /** - * optional string history_url = 7; - * @return whether the historyUrl field is set - */ - public boolean hasHistoryUrl() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional string history_url = 7; - * @return this - */ - public GachaInfo clearHistoryUrl() { - bitField0_ &= ~0x00000010; - 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_ |= 0x00000010; - return this.historyUrl; - } - - /** - * optional string history_url = 7; - * @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 = 7; - * @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 = 14; + * optional string detail_url = 9; * @return whether the detailUrl field is set */ public boolean hasDetailUrl() { @@ -312,7 +289,7 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 14; + * optional string detail_url = 9; * @return this */ public GachaInfo clearDetailUrl() { @@ -322,7 +299,7 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 14; + * optional string detail_url = 9; * @return the detailUrl */ public String getDetailUrl() { @@ -330,7 +307,7 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 14; + * optional string detail_url = 9; * @return internal {@code Utf8String} representation of detailUrl for reading */ public Utf8String getDetailUrlBytes() { @@ -338,7 +315,7 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 14; + * optional string detail_url = 9; * @return internal {@code Utf8String} representation of detailUrl for modifications */ public Utf8String getMutableDetailUrlBytes() { @@ -347,7 +324,7 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 14; + * optional string detail_url = 9; * @param value the detailUrl to set * @return this */ @@ -358,7 +335,7 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 14; + * optional string detail_url = 9; * @param value the detailUrl to set * @return this */ @@ -369,25 +346,90 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 4; - * @return whether the upInfo field is set + * optional string history_url = 10; + * @return whether the historyUrl field is set */ - public boolean hasUpInfo() { + public boolean hasHistoryUrl() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated uint32 up_info = 4; + * optional string history_url = 10; + * @return this + */ + public GachaInfo clearHistoryUrl() { + bitField0_ &= ~0x00000040; + historyUrl.clear(); + return this; + } + + /** + * optional string history_url = 10; + * @return the historyUrl + */ + public String getHistoryUrl() { + return historyUrl.getString(); + } + + /** + * optional string history_url = 10; + * @return internal {@code Utf8String} representation of historyUrl for reading + */ + public Utf8String getHistoryUrlBytes() { + return this.historyUrl; + } + + /** + * optional string history_url = 10; + * @return internal {@code Utf8String} representation of historyUrl for modifications + */ + public Utf8String getMutableHistoryUrlBytes() { + bitField0_ |= 0x00000040; + return this.historyUrl; + } + + /** + * optional string history_url = 10; + * @param value the historyUrl to set + * @return this + */ + public GachaInfo setHistoryUrl(final CharSequence value) { + bitField0_ |= 0x00000040; + historyUrl.copyFrom(value); + return this; + } + + /** + * optional string history_url = 10; + * @param value the historyUrl to set + * @return this + */ + public GachaInfo setHistoryUrl(final Utf8String value) { + bitField0_ |= 0x00000040; + historyUrl.copyFrom(value); + return this; + } + + /** + * repeated uint32 up_info = 2; + * @return whether the upInfo field is set + */ + public boolean hasUpInfo() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated uint32 up_info = 2; * @return this */ public GachaInfo clearUpInfo() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000080; upInfo.clear(); return this; } /** - * repeated uint32 up_info = 4; + * repeated uint32 up_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. @@ -401,7 +443,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 4; + * repeated uint32 up_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 @@ -410,52 +452,52 @@ public final class GachaInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableUpInfo() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; return upInfo; } /** - * repeated uint32 up_info = 4; + * repeated uint32 up_info = 2; * @param value the upInfo to add * @return this */ public GachaInfo addUpInfo(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; upInfo.add(value); return this; } /** - * repeated uint32 up_info = 4; + * repeated uint32 up_info = 2; * @param values the upInfo to add * @return this */ public GachaInfo addAllUpInfo(final int... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; upInfo.addAll(values); return this; } /** - * repeated uint32 featured = 8; + * repeated uint32 featured = 4; * @return whether the featured field is set */ public boolean hasFeatured() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * repeated uint32 featured = 8; + * repeated uint32 featured = 4; * @return this */ public GachaInfo clearFeatured() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000100; featured.clear(); return this; } /** - * repeated uint32 featured = 8; + * 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 +511,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 featured = 8; + * 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,28 +520,28 @@ public final class GachaInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableFeatured() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return featured; } /** - * repeated uint32 featured = 8; + * repeated uint32 featured = 4; * @param value the featured to add * @return this */ public GachaInfo addFeatured(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; featured.add(value); return this; } /** - * repeated uint32 featured = 8; + * repeated uint32 featured = 4; * @param values the featured to add * @return this */ public GachaInfo addAllFeatured(final int... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; featured.addAll(values); return this; } @@ -512,9 +554,10 @@ public final class GachaInfoOuterClass { endTime = other.endTime; beginTime = other.beginTime; gachaId = other.gachaId; + currentGachaTime = other.currentGachaTime; gachaCeiling.copyFrom(other.gachaCeiling); - historyUrl.copyFrom(other.historyUrl); detailUrl.copyFrom(other.detailUrl); + historyUrl.copyFrom(other.historyUrl); upInfo.copyFrom(other.upInfo); featured.copyFrom(other.featured); } @@ -536,15 +579,18 @@ public final class GachaInfoOuterClass { if (other.hasGachaId()) { setGachaId(other.gachaId); } + if (other.hasCurrentGachaTime()) { + setCurrentGachaTime(other.currentGachaTime); + } if (other.hasGachaCeiling()) { getMutableGachaCeiling().mergeFrom(other.gachaCeiling); } - if (other.hasHistoryUrl()) { - getMutableHistoryUrlBytes().copyFrom(other.historyUrl); - } if (other.hasDetailUrl()) { getMutableDetailUrlBytes().copyFrom(other.detailUrl); } + if (other.hasHistoryUrl()) { + getMutableHistoryUrlBytes().copyFrom(other.historyUrl); + } if (other.hasUpInfo()) { getMutableUpInfo().addAll(other.upInfo); } @@ -564,9 +610,10 @@ public final class GachaInfoOuterClass { endTime = 0L; beginTime = 0L; gachaId = 0; + currentGachaTime = 0; gachaCeiling.clear(); - historyUrl.clear(); detailUrl.clear(); + historyUrl.clear(); upInfo.clear(); featured.clear(); return this; @@ -580,8 +627,8 @@ public final class GachaInfoOuterClass { cachedSize = -1; bitField0_ = 0; gachaCeiling.clearQuick(); - historyUrl.clear(); detailUrl.clear(); + historyUrl.clear(); upInfo.clear(); featured.clear(); return this; @@ -600,9 +647,10 @@ public final class GachaInfoOuterClass { && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) && (!hasGachaId() || gachaId == other.gachaId) + && (!hasCurrentGachaTime() || currentGachaTime == other.currentGachaTime) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)) - && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) && (!hasDetailUrl() || detailUrl.equals(other.detailUrl)) + && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) && (!hasUpInfo() || upInfo.equals(other.upInfo)) && (!hasFeatured() || featured.equals(other.featured)); } @@ -610,7 +658,7 @@ public final class GachaInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 40); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { @@ -618,30 +666,34 @@ public final class GachaInfoOuterClass { output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(gachaCeiling); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(currentGachaTime); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 58); - output.writeStringNoTag(historyUrl); + output.writeRawByte((byte) 122); + output.writeMessageNoTag(gachaCeiling); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 74); output.writeStringNoTag(detailUrl); } if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 82); + output.writeStringNoTag(historyUrl); + } + if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < upInfo.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(upInfo.array()[i]); } } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < featured.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(featured.array()[i]); } } @@ -660,18 +712,21 @@ public final class GachaInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); + size += 1 + ProtoSink.computeUInt32SizeNoTag(currentGachaTime); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); + size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); + size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); } if ((bitField0_ & 0x00000080) != 0) { + size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); + } + if ((bitField0_ & 0x00000100) != 0) { size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured); } return size; @@ -684,7 +739,7 @@ public final class GachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 40: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000001; @@ -698,59 +753,68 @@ public final class GachaInfoOuterClass { beginTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { + case 88: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // currentGachaTime + currentGachaTime = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // gachaCeiling + input.readMessage(gachaCeiling); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // detailUrl + input.readString(detailUrl); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 82) { break; } } case 82: { - // gachaCeiling - input.readMessage(gachaCeiling); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { // historyUrl input.readString(historyUrl); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 114) { + if (tag != 18) { break; } } - case 114: { - // detailUrl - input.readString(detailUrl); - bitField0_ |= 0x00000020; + case 18: { + // upInfo [packed=true] + input.readPackedUInt32(upInfo, tag); + bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 34) { break; } } case 34: { - // upInfo [packed=true] - input.readPackedUInt32(upInfo, tag); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { // featured [packed=true] input.readPackedUInt32(featured, tag); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 0) { break; @@ -766,16 +830,16 @@ public final class GachaInfoOuterClass { tag = input.readTag(); break; } - case 32: { + case 16: { // upInfo [packed=false] tag = input.readRepeatedUInt32(upInfo, tag); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } - case 64: { + case 32: { // featured [packed=false] tag = input.readRepeatedUInt32(featured, tag); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; break; } } @@ -795,18 +859,21 @@ public final class GachaInfoOuterClass { output.writeUInt32(FieldNames.gachaId, gachaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); + output.writeUInt32(FieldNames.currentGachaTime, currentGachaTime); } if ((bitField0_ & 0x00000010) != 0) { - output.writeString(FieldNames.historyUrl, historyUrl); + output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); } if ((bitField0_ & 0x00000020) != 0) { output.writeString(FieldNames.detailUrl, detailUrl); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); + output.writeString(FieldNames.historyUrl, historyUrl); } if ((bitField0_ & 0x00000080) != 0) { + output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); + } + if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedUInt32(FieldNames.featured, featured); } output.endObject(); @@ -855,11 +922,11 @@ public final class GachaInfoOuterClass { } break; } - case 507275483: - case -1792489728: { - if (input.isAtField(FieldNames.gachaCeiling)) { + case 1941683702: + case 2062533104: { + if (input.isAtField(FieldNames.currentGachaTime)) { if (!input.trySkipNullValue()) { - input.readMessage(gachaCeiling); + currentGachaTime = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -867,11 +934,11 @@ public final class GachaInfoOuterClass { } break; } - case 1951019067: - case 352350020: { - if (input.isAtField(FieldNames.historyUrl)) { + case 507275483: + case -1792489728: { + if (input.isAtField(FieldNames.gachaCeiling)) { if (!input.trySkipNullValue()) { - input.readString(historyUrl); + input.readMessage(gachaCeiling); bitField0_ |= 0x00000010; } } else { @@ -891,12 +958,24 @@ public final class GachaInfoOuterClass { } break; } + case 1951019067: + case 352350020: { + if (input.isAtField(FieldNames.historyUrl)) { + if (!input.trySkipNullValue()) { + input.readString(historyUrl); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } case -839638551: case -238815278: { if (input.isAtField(FieldNames.upInfo)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(upInfo); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -907,7 +986,7 @@ public final class GachaInfoOuterClass { if (input.isAtField(FieldNames.featured)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(featured); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -972,12 +1051,14 @@ public final class GachaInfoOuterClass { static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); + static final FieldName currentGachaTime = FieldName.forField("currentGachaTime", "current_gacha_time"); + 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 historyUrl = FieldName.forField("historyUrl", "history_url"); + static final FieldName upInfo = FieldName.forField("upInfo", "up_info"); static final FieldName featured = FieldName.forField("featured"); diff --git a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java index b2d4486..fc02bbe 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java @@ -19,25 +19,25 @@ public final class GachaItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_new = 9; + * optional bool is_new = 13; */ private boolean isNew; /** - * optional .Item gacha_item = 3; + * optional .Item gacha_item = 1; */ private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance(); /** - * optional .ItemList token_item = 12; - */ - private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); - - /** - * optional .ItemList transfer_item_list = 13; + * optional .ItemList transfer_item_list = 4; */ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); + /** + * optional .ItemList token_item = 9; + */ + private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); + private GachaItem() { } @@ -49,7 +49,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 9; + * optional bool is_new = 13; * @return whether the isNew field is set */ public boolean hasIsNew() { @@ -57,7 +57,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 9; + * optional bool is_new = 13; * @return this */ public GachaItem clearIsNew() { @@ -67,7 +67,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 9; + * optional bool is_new = 13; * @return the isNew */ public boolean getIsNew() { @@ -75,7 +75,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 9; + * optional bool is_new = 13; * @param value the isNew to set * @return this */ @@ -86,7 +86,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 3; + * optional .Item gacha_item = 1; * @return whether the gachaItem field is set */ public boolean hasGachaItem() { @@ -94,7 +94,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 3; + * optional .Item gacha_item = 1; * @return this */ public GachaItem clearGachaItem() { @@ -104,7 +104,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 3; + * optional .Item gacha_item = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -118,7 +118,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 3; + * optional .Item gacha_item = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -132,7 +132,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 3; + * optional .Item gacha_item = 1; * @param value the gachaItem to set * @return this */ @@ -143,82 +143,25 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList token_item = 12; - * @return whether the tokenItem field is set + * optional .ItemList transfer_item_list = 4; + * @return whether the transferItemList field is set */ - public boolean hasTokenItem() { + public boolean hasTransferItemList() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .ItemList token_item = 12; - * @return this - */ - public GachaItem clearTokenItem() { - bitField0_ &= ~0x00000004; - tokenItem.clear(); - return this; - } - - /** - * optional .ItemList token_item = 12; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableTokenItem()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ItemListOuterClass.ItemList getTokenItem() { - return tokenItem; - } - - /** - * optional .ItemList token_item = 12; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ItemListOuterClass.ItemList getMutableTokenItem() { - bitField0_ |= 0x00000004; - return tokenItem; - } - - /** - * optional .ItemList token_item = 12; - * @param value the tokenItem to set - * @return this - */ - public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000004; - tokenItem.copyFrom(value); - return this; - } - - /** - * optional .ItemList transfer_item_list = 13; - * @return whether the transferItemList field is set - */ - public boolean hasTransferItemList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .ItemList transfer_item_list = 13; + * optional .ItemList transfer_item_list = 4; * @return this */ public GachaItem clearTransferItemList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; transferItemList.clear(); return this; } /** - * optional .ItemList transfer_item_list = 13; + * optional .ItemList transfer_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. @@ -232,7 +175,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 13; + * optional .ItemList transfer_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 @@ -241,21 +184,78 @@ public final class GachaItemOuterClass { * @return internal storage object for modifications */ public ItemListOuterClass.ItemList getMutableTransferItemList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return transferItemList; } /** - * optional .ItemList transfer_item_list = 13; + * optional .ItemList transfer_item_list = 4; * @param value the transferItemList to set * @return this */ public GachaItem setTransferItemList(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; transferItemList.copyFrom(value); return this; } + /** + * optional .ItemList token_item = 9; + * @return whether the tokenItem field is set + */ + public boolean hasTokenItem() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .ItemList token_item = 9; + * @return this + */ + public GachaItem clearTokenItem() { + bitField0_ &= ~0x00000008; + tokenItem.clear(); + return this; + } + + /** + * optional .ItemList token_item = 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 #getMutableTokenItem()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ItemListOuterClass.ItemList getTokenItem() { + return tokenItem; + } + + /** + * optional .ItemList token_item = 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 ItemListOuterClass.ItemList getMutableTokenItem() { + bitField0_ |= 0x00000008; + return tokenItem; + } + + /** + * optional .ItemList token_item = 9; + * @param value the tokenItem to set + * @return this + */ + public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000008; + tokenItem.copyFrom(value); + return this; + } + @Override public GachaItem copyFrom(final GachaItem other) { cachedSize = other.cachedSize; @@ -263,8 +263,8 @@ public final class GachaItemOuterClass { bitField0_ = other.bitField0_; isNew = other.isNew; gachaItem.copyFrom(other.gachaItem); - tokenItem.copyFrom(other.tokenItem); transferItemList.copyFrom(other.transferItemList); + tokenItem.copyFrom(other.tokenItem); } return this; } @@ -281,12 +281,12 @@ public final class GachaItemOuterClass { if (other.hasGachaItem()) { getMutableGachaItem().mergeFrom(other.gachaItem); } - if (other.hasTokenItem()) { - getMutableTokenItem().mergeFrom(other.tokenItem); - } if (other.hasTransferItemList()) { getMutableTransferItemList().mergeFrom(other.transferItemList); } + if (other.hasTokenItem()) { + getMutableTokenItem().mergeFrom(other.tokenItem); + } return this; } @@ -299,8 +299,8 @@ public final class GachaItemOuterClass { bitField0_ = 0; isNew = false; gachaItem.clear(); - tokenItem.clear(); transferItemList.clear(); + tokenItem.clear(); return this; } @@ -312,8 +312,8 @@ public final class GachaItemOuterClass { cachedSize = -1; bitField0_ = 0; gachaItem.clearQuick(); - tokenItem.clearQuick(); transferItemList.clearQuick(); + tokenItem.clearQuick(); return this; } @@ -329,27 +329,27 @@ public final class GachaItemOuterClass { return bitField0_ == other.bitField0_ && (!hasIsNew() || isNew == other.isNew) && (!hasGachaItem() || gachaItem.equals(other.gachaItem)) - && (!hasTokenItem() || tokenItem.equals(other.tokenItem)) - && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)); + && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)) + && (!hasTokenItem() || tokenItem.equals(other.tokenItem)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 104); output.writeBoolNoTag(isNew); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 10); output.writeMessageNoTag(gachaItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(tokenItem); + output.writeRawByte((byte) 34); + output.writeMessageNoTag(transferItemList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(transferItemList); + output.writeRawByte((byte) 74); + output.writeMessageNoTag(tokenItem); } } @@ -363,10 +363,10 @@ public final class GachaItemOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList); + size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem); } return size; } @@ -378,36 +378,36 @@ public final class GachaItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 104: { // isNew isNew = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { + case 10: { // gachaItem input.readMessage(gachaItem); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { + if (tag != 34) { break; } } - case 98: { - // tokenItem - input.readMessage(tokenItem); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { + case 34: { // transferItemList input.readMessage(transferItemList); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // tokenItem + input.readMessage(tokenItem); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -438,10 +438,10 @@ public final class GachaItemOuterClass { output.writeMessage(FieldNames.gachaItem, gachaItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.tokenItem, tokenItem); + output.writeMessage(FieldNames.transferItemList, transferItemList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.transferItemList, transferItemList); + output.writeMessage(FieldNames.tokenItem, tokenItem); } output.endObject(); } @@ -477,11 +477,11 @@ public final class GachaItemOuterClass { } break; } - case 141165740: - case 101174681: { - if (input.isAtField(FieldNames.tokenItem)) { + case -997597348: + case 263056118: { + if (input.isAtField(FieldNames.transferItemList)) { if (!input.trySkipNullValue()) { - input.readMessage(tokenItem); + input.readMessage(transferItemList); bitField0_ |= 0x00000004; } } else { @@ -489,11 +489,11 @@ public final class GachaItemOuterClass { } break; } - case -997597348: - case 263056118: { - if (input.isAtField(FieldNames.transferItemList)) { + case 141165740: + case 101174681: { + if (input.isAtField(FieldNames.tokenItem)) { if (!input.trySkipNullValue()) { - input.readMessage(transferItemList); + input.readMessage(tokenItem); bitField0_ |= 0x00000008; } } else { @@ -557,9 +557,9 @@ public final class GachaItemOuterClass { static final FieldName gachaItem = FieldName.forField("gachaItem", "gacha_item"); - static final FieldName tokenItem = FieldName.forField("tokenItem", "token_item"); - static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list"); + + static final FieldName tokenItem = FieldName.forField("tokenItem", "token_item"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java index a9be312..a77a536 100644 --- a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java @@ -20,95 +20,102 @@ public final class GateserverOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 port = 12; + * optional uint32 port = 2; */ private int port; /** - * optional bool unk1 = 6; + * optional bool enable_version_update = 1; */ - private boolean unk1; + private boolean enableVersionUpdate; /** - * optional bool unk2 = 13; + * optional bool enable_design_data_bundle_version_update = 7; */ - private boolean unk2; + private boolean enableDesignDataBundleVersionUpdate; /** - * optional bool unk3 = 82; + * optional bool event_tracking_open = 414; */ - private boolean unk3; + private boolean eventTrackingOpen; /** - * optional bool unk4 = 737; + * optional bool enable_android_middle_package = 593; */ - private boolean unk4; + private boolean enableAndroidMiddlePackage; /** - * optional bool unk5 = 1037; + * 
+     *  for beta, useless on release
+ * + * optional bool enable_watermark = 1457; */ - private boolean unk5; + private boolean enableWatermark; /** - * optional bool unk6 = 1401; + * optional bool close_redeem_code = 1486; */ - private boolean unk6; + private boolean closeRedeemCode; /** - * optional bool unk7 = 1851; + * optional bool network_diagnostic = 1566; */ - private boolean unk7; + private boolean networkDiagnostic; /** - * optional string ip = 1; + * optional string asset_bundle_url = 3; + */ + private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); + + /** + * optional string ip = 4; */ private final Utf8String ip = Utf8String.newEmptyInstance(); /** - * optional string lua_url = 2; - */ - private final Utf8String luaUrl = Utf8String.newEmptyInstance(); - - /** - * optional string region_name = 10; + * optional string region_name = 5; */ private final Utf8String regionName = Utf8String.newEmptyInstance(); + /** + * optional string lua_url = 10; + */ + private final Utf8String luaUrl = Utf8String.newEmptyInstance(); + /** * optional string ex_resource_url = 14; */ private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); /** - * optional string asset_bundle_url = 15; - */ - private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); - - /** - * optional string msg = 383; - */ - private final Utf8String msg = Utf8String.newEmptyInstance(); - - /** - * optional string ifix_version = 1209; - */ - private final Utf8String ifixVersion = Utf8String.newEmptyInstance(); - - /** - * optional string client_secret_key = 1597; - */ - private final Utf8String clientSecretKey = Utf8String.newEmptyInstance(); - - /** - * optional string mdk_res_version = 1798; + * optional string mdk_res_version = 661; */ private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); /** - * optional string ifix_url = 1895; + * optional string ifix_url = 1113; */ private final Utf8String ifixUrl = Utf8String.newEmptyInstance(); + /** + * optional string msg = 1192; + */ + private final Utf8String msg = Utf8String.newEmptyInstance(); + + /** + * 
+     *  guessed
+     *
+ * + * optional string ifix_version = 1430; + */ + private final Utf8String ifixVersion = Utf8String.newEmptyInstance(); + + /** + * optional string client_secret_key = 1808; + */ + private final Utf8String clientSecretKey = Utf8String.newEmptyInstance(); + private Gateserver() { } @@ -120,7 +127,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 12; + * optional uint32 port = 2; * @return whether the port field is set */ public boolean hasPort() { @@ -128,7 +135,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 12; + * optional uint32 port = 2; * @return this */ public Gateserver clearPort() { @@ -138,7 +145,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 12; + * optional uint32 port = 2; * @return the port */ public int getPort() { @@ -146,7 +153,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 12; + * optional uint32 port = 2; * @param value the port to set * @return this */ @@ -157,284 +164,361 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 6; - * @return whether the unk1 field is set + * optional bool enable_version_update = 1; + * @return whether the enableVersionUpdate field is set */ - public boolean hasUnk1() { + public boolean hasEnableVersionUpdate() { return (bitField0_ & 0x00000002) != 0; } /** - * optional bool unk1 = 6; + * optional bool enable_version_update = 1; * @return this */ - public Gateserver clearUnk1() { + public Gateserver clearEnableVersionUpdate() { bitField0_ &= ~0x00000002; - unk1 = false; + enableVersionUpdate = false; return this; } /** - * optional bool unk1 = 6; - * @return the unk1 + * optional bool enable_version_update = 1; + * @return the enableVersionUpdate */ - public boolean getUnk1() { - return unk1; + public boolean getEnableVersionUpdate() { + return enableVersionUpdate; } /** - * optional bool unk1 = 6; - * @param value the unk1 to set + * optional bool enable_version_update = 1; + * @param value the enableVersionUpdate to set * @return this */ - public Gateserver setUnk1(final boolean value) { + public Gateserver setEnableVersionUpdate(final boolean value) { bitField0_ |= 0x00000002; - unk1 = value; + enableVersionUpdate = value; return this; } /** - * optional bool unk2 = 13; - * @return whether the unk2 field is set + * optional bool enable_design_data_bundle_version_update = 7; + * @return whether the enableDesignDataBundleVersionUpdate field is set */ - public boolean hasUnk2() { + public boolean hasEnableDesignDataBundleVersionUpdate() { return (bitField0_ & 0x00000004) != 0; } /** - * optional bool unk2 = 13; + * optional bool enable_design_data_bundle_version_update = 7; * @return this */ - public Gateserver clearUnk2() { + public Gateserver clearEnableDesignDataBundleVersionUpdate() { bitField0_ &= ~0x00000004; - unk2 = false; + enableDesignDataBundleVersionUpdate = false; return this; } /** - * optional bool unk2 = 13; - * @return the unk2 + * optional bool enable_design_data_bundle_version_update = 7; + * @return the enableDesignDataBundleVersionUpdate */ - public boolean getUnk2() { - return unk2; + public boolean getEnableDesignDataBundleVersionUpdate() { + return enableDesignDataBundleVersionUpdate; } /** - * optional bool unk2 = 13; - * @param value the unk2 to set + * optional bool enable_design_data_bundle_version_update = 7; + * @param value the enableDesignDataBundleVersionUpdate to set * @return this */ - public Gateserver setUnk2(final boolean value) { + public Gateserver setEnableDesignDataBundleVersionUpdate(final boolean value) { bitField0_ |= 0x00000004; - unk2 = value; + enableDesignDataBundleVersionUpdate = value; return this; } /** - * optional bool unk3 = 82; - * @return whether the unk3 field is set + * optional bool event_tracking_open = 414; + * @return whether the eventTrackingOpen field is set */ - public boolean hasUnk3() { + public boolean hasEventTrackingOpen() { return (bitField0_ & 0x00000008) != 0; } /** - * optional bool unk3 = 82; + * optional bool event_tracking_open = 414; * @return this */ - public Gateserver clearUnk3() { + public Gateserver clearEventTrackingOpen() { bitField0_ &= ~0x00000008; - unk3 = false; + eventTrackingOpen = false; return this; } /** - * optional bool unk3 = 82; - * @return the unk3 + * optional bool event_tracking_open = 414; + * @return the eventTrackingOpen */ - public boolean getUnk3() { - return unk3; + public boolean getEventTrackingOpen() { + return eventTrackingOpen; } /** - * optional bool unk3 = 82; - * @param value the unk3 to set + * optional bool event_tracking_open = 414; + * @param value the eventTrackingOpen to set * @return this */ - public Gateserver setUnk3(final boolean value) { + public Gateserver setEventTrackingOpen(final boolean value) { bitField0_ |= 0x00000008; - unk3 = value; + eventTrackingOpen = value; return this; } /** - * optional bool unk4 = 737; - * @return whether the unk4 field is set + * optional bool enable_android_middle_package = 593; + * @return whether the enableAndroidMiddlePackage field is set */ - public boolean hasUnk4() { + public boolean hasEnableAndroidMiddlePackage() { return (bitField0_ & 0x00000010) != 0; } /** - * optional bool unk4 = 737; + * optional bool enable_android_middle_package = 593; * @return this */ - public Gateserver clearUnk4() { + public Gateserver clearEnableAndroidMiddlePackage() { bitField0_ &= ~0x00000010; - unk4 = false; + enableAndroidMiddlePackage = false; return this; } /** - * optional bool unk4 = 737; - * @return the unk4 + * optional bool enable_android_middle_package = 593; + * @return the enableAndroidMiddlePackage */ - public boolean getUnk4() { - return unk4; + public boolean getEnableAndroidMiddlePackage() { + return enableAndroidMiddlePackage; } /** - * optional bool unk4 = 737; - * @param value the unk4 to set + * optional bool enable_android_middle_package = 593; + * @param value the enableAndroidMiddlePackage to set * @return this */ - public Gateserver setUnk4(final boolean value) { + public Gateserver setEnableAndroidMiddlePackage(final boolean value) { bitField0_ |= 0x00000010; - unk4 = value; + enableAndroidMiddlePackage = value; return this; } /** - * optional bool unk5 = 1037; - * @return whether the unk5 field is set + * 
+     *  for beta, useless on release
+ * + * optional bool enable_watermark = 1457; + * @return whether the enableWatermark field is set */ - public boolean hasUnk5() { + public boolean hasEnableWatermark() { return (bitField0_ & 0x00000020) != 0; } /** - * optional bool unk5 = 1037; + * 
+     *  for beta, useless on release
+ * + * optional bool enable_watermark = 1457; * @return this */ - public Gateserver clearUnk5() { + public Gateserver clearEnableWatermark() { bitField0_ &= ~0x00000020; - unk5 = false; + enableWatermark = false; return this; } /** - * optional bool unk5 = 1037; - * @return the unk5 + * 
+     *  for beta, useless on release
+ * + * optional bool enable_watermark = 1457; + * @return the enableWatermark */ - public boolean getUnk5() { - return unk5; + public boolean getEnableWatermark() { + return enableWatermark; } /** - * optional bool unk5 = 1037; - * @param value the unk5 to set + * 
+     *  for beta, useless on release
+ * + * optional bool enable_watermark = 1457; + * @param value the enableWatermark to set * @return this */ - public Gateserver setUnk5(final boolean value) { + public Gateserver setEnableWatermark(final boolean value) { bitField0_ |= 0x00000020; - unk5 = value; + enableWatermark = value; return this; } /** - * optional bool unk6 = 1401; - * @return whether the unk6 field is set + * optional bool close_redeem_code = 1486; + * @return whether the closeRedeemCode field is set */ - public boolean hasUnk6() { + public boolean hasCloseRedeemCode() { return (bitField0_ & 0x00000040) != 0; } /** - * optional bool unk6 = 1401; + * optional bool close_redeem_code = 1486; * @return this */ - public Gateserver clearUnk6() { + public Gateserver clearCloseRedeemCode() { bitField0_ &= ~0x00000040; - unk6 = false; + closeRedeemCode = false; return this; } /** - * optional bool unk6 = 1401; - * @return the unk6 + * optional bool close_redeem_code = 1486; + * @return the closeRedeemCode */ - public boolean getUnk6() { - return unk6; + public boolean getCloseRedeemCode() { + return closeRedeemCode; } /** - * optional bool unk6 = 1401; - * @param value the unk6 to set + * optional bool close_redeem_code = 1486; + * @param value the closeRedeemCode to set * @return this */ - public Gateserver setUnk6(final boolean value) { + public Gateserver setCloseRedeemCode(final boolean value) { bitField0_ |= 0x00000040; - unk6 = value; + closeRedeemCode = value; return this; } /** - * optional bool unk7 = 1851; - * @return whether the unk7 field is set + * optional bool network_diagnostic = 1566; + * @return whether the networkDiagnostic field is set */ - public boolean hasUnk7() { + public boolean hasNetworkDiagnostic() { return (bitField0_ & 0x00000080) != 0; } /** - * optional bool unk7 = 1851; + * optional bool network_diagnostic = 1566; * @return this */ - public Gateserver clearUnk7() { + public Gateserver clearNetworkDiagnostic() { bitField0_ &= ~0x00000080; - unk7 = false; + networkDiagnostic = false; return this; } /** - * optional bool unk7 = 1851; - * @return the unk7 + * optional bool network_diagnostic = 1566; + * @return the networkDiagnostic */ - public boolean getUnk7() { - return unk7; + public boolean getNetworkDiagnostic() { + return networkDiagnostic; } /** - * optional bool unk7 = 1851; - * @param value the unk7 to set + * optional bool network_diagnostic = 1566; + * @param value the networkDiagnostic to set * @return this */ - public Gateserver setUnk7(final boolean value) { + public Gateserver setNetworkDiagnostic(final boolean value) { bitField0_ |= 0x00000080; - unk7 = value; + networkDiagnostic = value; return this; } /** - * optional string ip = 1; - * @return whether the ip field is set + * optional string asset_bundle_url = 3; + * @return whether the assetBundleUrl field is set */ - public boolean hasIp() { + public boolean hasAssetBundleUrl() { return (bitField0_ & 0x00000100) != 0; } /** - * optional string ip = 1; + * optional string asset_bundle_url = 3; + * @return this + */ + public Gateserver clearAssetBundleUrl() { + bitField0_ &= ~0x00000100; + assetBundleUrl.clear(); + return this; + } + + /** + * optional string asset_bundle_url = 3; + * @return the assetBundleUrl + */ + public String getAssetBundleUrl() { + return assetBundleUrl.getString(); + } + + /** + * optional string asset_bundle_url = 3; + * @return internal {@code Utf8String} representation of assetBundleUrl for reading + */ + public Utf8String getAssetBundleUrlBytes() { + return this.assetBundleUrl; + } + + /** + * optional string asset_bundle_url = 3; + * @return internal {@code Utf8String} representation of assetBundleUrl for modifications + */ + public Utf8String getMutableAssetBundleUrlBytes() { + bitField0_ |= 0x00000100; + return this.assetBundleUrl; + } + + /** + * optional string asset_bundle_url = 3; + * @param value the assetBundleUrl to set + * @return this + */ + public Gateserver setAssetBundleUrl(final CharSequence value) { + bitField0_ |= 0x00000100; + assetBundleUrl.copyFrom(value); + return this; + } + + /** + * optional string asset_bundle_url = 3; + * @param value the assetBundleUrl to set + * @return this + */ + public Gateserver setAssetBundleUrl(final Utf8String value) { + bitField0_ |= 0x00000100; + assetBundleUrl.copyFrom(value); + return this; + } + + /** + * optional string ip = 4; + * @return whether the ip field is set + */ + public boolean hasIp() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional string ip = 4; * @return this */ public Gateserver clearIp() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000200; ip.clear(); return this; } /** - * optional string ip = 1; + * optional string ip = 4; * @return the ip */ public String getIp() { @@ -442,7 +526,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 1; + * optional string ip = 4; * @return internal {@code Utf8String} representation of ip for reading */ public Utf8String getIpBytes() { @@ -450,103 +534,38 @@ public final class GateserverOuterClass { } /** - * optional string ip = 1; + * optional string ip = 4; * @return internal {@code Utf8String} representation of ip for modifications */ public Utf8String getMutableIpBytes() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this.ip; } /** - * optional string ip = 1; + * optional string ip = 4; * @param value the ip to set * @return this */ public Gateserver setIp(final CharSequence value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; ip.copyFrom(value); return this; } /** - * optional string ip = 1; + * optional string ip = 4; * @param value the ip to set * @return this */ public Gateserver setIp(final Utf8String value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; ip.copyFrom(value); return this; } /** - * optional string lua_url = 2; - * @return whether the luaUrl field is set - */ - public boolean hasLuaUrl() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * optional string lua_url = 2; - * @return this - */ - public Gateserver clearLuaUrl() { - bitField0_ &= ~0x00000200; - luaUrl.clear(); - return this; - } - - /** - * optional string lua_url = 2; - * @return the luaUrl - */ - public String getLuaUrl() { - return luaUrl.getString(); - } - - /** - * optional string lua_url = 2; - * @return internal {@code Utf8String} representation of luaUrl for reading - */ - public Utf8String getLuaUrlBytes() { - return this.luaUrl; - } - - /** - * optional string lua_url = 2; - * @return internal {@code Utf8String} representation of luaUrl for modifications - */ - public Utf8String getMutableLuaUrlBytes() { - bitField0_ |= 0x00000200; - return this.luaUrl; - } - - /** - * optional string lua_url = 2; - * @param value the luaUrl to set - * @return this - */ - public Gateserver setLuaUrl(final CharSequence value) { - bitField0_ |= 0x00000200; - luaUrl.copyFrom(value); - return this; - } - - /** - * optional string lua_url = 2; - * @param value the luaUrl to set - * @return this - */ - public Gateserver setLuaUrl(final Utf8String value) { - bitField0_ |= 0x00000200; - luaUrl.copyFrom(value); - return this; - } - - /** - * optional string region_name = 10; + * optional string region_name = 5; * @return whether the regionName field is set */ public boolean hasRegionName() { @@ -554,7 +573,7 @@ public final class GateserverOuterClass { } /** - * optional string region_name = 10; + * optional string region_name = 5; * @return this */ public Gateserver clearRegionName() { @@ -564,7 +583,7 @@ public final class GateserverOuterClass { } /** - * optional string region_name = 10; + * optional string region_name = 5; * @return the regionName */ public String getRegionName() { @@ -572,7 +591,7 @@ public final class GateserverOuterClass { } /** - * optional string region_name = 10; + * optional string region_name = 5; * @return internal {@code Utf8String} representation of regionName for reading */ public Utf8String getRegionNameBytes() { @@ -580,7 +599,7 @@ public final class GateserverOuterClass { } /** - * optional string region_name = 10; + * optional string region_name = 5; * @return internal {@code Utf8String} representation of regionName for modifications */ public Utf8String getMutableRegionNameBytes() { @@ -589,7 +608,7 @@ public final class GateserverOuterClass { } /** - * optional string region_name = 10; + * optional string region_name = 5; * @param value the regionName to set * @return this */ @@ -600,7 +619,7 @@ public final class GateserverOuterClass { } /** - * optional string region_name = 10; + * optional string region_name = 5; * @param value the regionName to set * @return this */ @@ -610,12 +629,77 @@ public final class GateserverOuterClass { return this; } + /** + * optional string lua_url = 10; + * @return whether the luaUrl field is set + */ + public boolean hasLuaUrl() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * optional string lua_url = 10; + * @return this + */ + public Gateserver clearLuaUrl() { + bitField0_ &= ~0x00000800; + luaUrl.clear(); + return this; + } + + /** + * optional string lua_url = 10; + * @return the luaUrl + */ + public String getLuaUrl() { + return luaUrl.getString(); + } + + /** + * optional string lua_url = 10; + * @return internal {@code Utf8String} representation of luaUrl for reading + */ + public Utf8String getLuaUrlBytes() { + return this.luaUrl; + } + + /** + * optional string lua_url = 10; + * @return internal {@code Utf8String} representation of luaUrl for modifications + */ + public Utf8String getMutableLuaUrlBytes() { + bitField0_ |= 0x00000800; + return this.luaUrl; + } + + /** + * optional string lua_url = 10; + * @param value the luaUrl to set + * @return this + */ + public Gateserver setLuaUrl(final CharSequence value) { + bitField0_ |= 0x00000800; + luaUrl.copyFrom(value); + return this; + } + + /** + * optional string lua_url = 10; + * @param value the luaUrl to set + * @return this + */ + public Gateserver setLuaUrl(final Utf8String value) { + bitField0_ |= 0x00000800; + luaUrl.copyFrom(value); + return this; + } + /** * optional string ex_resource_url = 14; * @return whether the exResourceUrl field is set */ public boolean hasExResourceUrl() { - return (bitField0_ & 0x00000800) != 0; + return (bitField0_ & 0x00001000) != 0; } /** @@ -623,7 +707,7 @@ public final class GateserverOuterClass { * @return this */ public Gateserver clearExResourceUrl() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00001000; exResourceUrl.clear(); return this; } @@ -649,7 +733,7 @@ public final class GateserverOuterClass { * @return internal {@code Utf8String} representation of exResourceUrl for modifications */ public Utf8String getMutableExResourceUrlBytes() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; return this.exResourceUrl; } @@ -659,7 +743,7 @@ public final class GateserverOuterClass { * @return this */ public Gateserver setExResourceUrl(final CharSequence value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; exResourceUrl.copyFrom(value); return this; } @@ -670,291 +754,31 @@ public final class GateserverOuterClass { * @return this */ public Gateserver setExResourceUrl(final Utf8String value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; exResourceUrl.copyFrom(value); return this; } /** - * optional string asset_bundle_url = 15; - * @return whether the assetBundleUrl field is set + * optional string mdk_res_version = 661; + * @return whether the mdkResVersion field is set */ - public boolean hasAssetBundleUrl() { - return (bitField0_ & 0x00001000) != 0; - } - - /** - * optional string asset_bundle_url = 15; - * @return this - */ - public Gateserver clearAssetBundleUrl() { - bitField0_ &= ~0x00001000; - assetBundleUrl.clear(); - return this; - } - - /** - * optional string asset_bundle_url = 15; - * @return the assetBundleUrl - */ - public String getAssetBundleUrl() { - return assetBundleUrl.getString(); - } - - /** - * optional string asset_bundle_url = 15; - * @return internal {@code Utf8String} representation of assetBundleUrl for reading - */ - public Utf8String getAssetBundleUrlBytes() { - return this.assetBundleUrl; - } - - /** - * optional string asset_bundle_url = 15; - * @return internal {@code Utf8String} representation of assetBundleUrl for modifications - */ - public Utf8String getMutableAssetBundleUrlBytes() { - bitField0_ |= 0x00001000; - return this.assetBundleUrl; - } - - /** - * optional string asset_bundle_url = 15; - * @param value the assetBundleUrl to set - * @return this - */ - public Gateserver setAssetBundleUrl(final CharSequence value) { - bitField0_ |= 0x00001000; - assetBundleUrl.copyFrom(value); - return this; - } - - /** - * optional string asset_bundle_url = 15; - * @param value the assetBundleUrl to set - * @return this - */ - public Gateserver setAssetBundleUrl(final Utf8String value) { - bitField0_ |= 0x00001000; - assetBundleUrl.copyFrom(value); - return this; - } - - /** - * optional string msg = 383; - * @return whether the msg field is set - */ - public boolean hasMsg() { + public boolean hasMdkResVersion() { return (bitField0_ & 0x00002000) != 0; } /** - * optional string msg = 383; - * @return this - */ - public Gateserver clearMsg() { - bitField0_ &= ~0x00002000; - msg.clear(); - return this; - } - - /** - * optional string msg = 383; - * @return the msg - */ - public String getMsg() { - return msg.getString(); - } - - /** - * optional string msg = 383; - * @return internal {@code Utf8String} representation of msg for reading - */ - public Utf8String getMsgBytes() { - return this.msg; - } - - /** - * optional string msg = 383; - * @return internal {@code Utf8String} representation of msg for modifications - */ - public Utf8String getMutableMsgBytes() { - bitField0_ |= 0x00002000; - return this.msg; - } - - /** - * optional string msg = 383; - * @param value the msg to set - * @return this - */ - public Gateserver setMsg(final CharSequence value) { - bitField0_ |= 0x00002000; - msg.copyFrom(value); - return this; - } - - /** - * optional string msg = 383; - * @param value the msg to set - * @return this - */ - public Gateserver setMsg(final Utf8String value) { - bitField0_ |= 0x00002000; - msg.copyFrom(value); - return this; - } - - /** - * optional string ifix_version = 1209; - * @return whether the ifixVersion field is set - */ - public boolean hasIfixVersion() { - return (bitField0_ & 0x00004000) != 0; - } - - /** - * optional string ifix_version = 1209; - * @return this - */ - public Gateserver clearIfixVersion() { - bitField0_ &= ~0x00004000; - ifixVersion.clear(); - return this; - } - - /** - * optional string ifix_version = 1209; - * @return the ifixVersion - */ - public String getIfixVersion() { - return ifixVersion.getString(); - } - - /** - * optional string ifix_version = 1209; - * @return internal {@code Utf8String} representation of ifixVersion for reading - */ - public Utf8String getIfixVersionBytes() { - return this.ifixVersion; - } - - /** - * optional string ifix_version = 1209; - * @return internal {@code Utf8String} representation of ifixVersion for modifications - */ - public Utf8String getMutableIfixVersionBytes() { - bitField0_ |= 0x00004000; - return this.ifixVersion; - } - - /** - * optional string ifix_version = 1209; - * @param value the ifixVersion to set - * @return this - */ - public Gateserver setIfixVersion(final CharSequence value) { - bitField0_ |= 0x00004000; - ifixVersion.copyFrom(value); - return this; - } - - /** - * optional string ifix_version = 1209; - * @param value the ifixVersion to set - * @return this - */ - public Gateserver setIfixVersion(final Utf8String value) { - bitField0_ |= 0x00004000; - ifixVersion.copyFrom(value); - return this; - } - - /** - * optional string client_secret_key = 1597; - * @return whether the clientSecretKey field is set - */ - public boolean hasClientSecretKey() { - return (bitField0_ & 0x00008000) != 0; - } - - /** - * optional string client_secret_key = 1597; - * @return this - */ - public Gateserver clearClientSecretKey() { - bitField0_ &= ~0x00008000; - clientSecretKey.clear(); - return this; - } - - /** - * optional string client_secret_key = 1597; - * @return the clientSecretKey - */ - public String getClientSecretKey() { - return clientSecretKey.getString(); - } - - /** - * optional string client_secret_key = 1597; - * @return internal {@code Utf8String} representation of clientSecretKey for reading - */ - public Utf8String getClientSecretKeyBytes() { - return this.clientSecretKey; - } - - /** - * optional string client_secret_key = 1597; - * @return internal {@code Utf8String} representation of clientSecretKey for modifications - */ - public Utf8String getMutableClientSecretKeyBytes() { - bitField0_ |= 0x00008000; - return this.clientSecretKey; - } - - /** - * optional string client_secret_key = 1597; - * @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 = 1597; - * @param value the clientSecretKey to set - * @return this - */ - public Gateserver setClientSecretKey(final Utf8String value) { - bitField0_ |= 0x00008000; - clientSecretKey.copyFrom(value); - return this; - } - - /** - * optional string mdk_res_version = 1798; - * @return whether the mdkResVersion field is set - */ - public boolean hasMdkResVersion() { - return (bitField0_ & 0x00010000) != 0; - } - - /** - * optional string mdk_res_version = 1798; + * optional string mdk_res_version = 661; * @return this */ public Gateserver clearMdkResVersion() { - bitField0_ &= ~0x00010000; + bitField0_ &= ~0x00002000; mdkResVersion.clear(); return this; } /** - * optional string mdk_res_version = 1798; + * optional string mdk_res_version = 661; * @return the mdkResVersion */ public String getMdkResVersion() { @@ -962,7 +786,7 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1798; + * optional string mdk_res_version = 661; * @return internal {@code Utf8String} representation of mdkResVersion for reading */ public Utf8String getMdkResVersionBytes() { @@ -970,56 +794,56 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1798; + * optional string mdk_res_version = 661; * @return internal {@code Utf8String} representation of mdkResVersion for modifications */ public Utf8String getMutableMdkResVersionBytes() { - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; return this.mdkResVersion; } /** - * optional string mdk_res_version = 1798; + * optional string mdk_res_version = 661; * @param value the mdkResVersion to set * @return this */ public Gateserver setMdkResVersion(final CharSequence value) { - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; mdkResVersion.copyFrom(value); return this; } /** - * optional string mdk_res_version = 1798; + * optional string mdk_res_version = 661; * @param value the mdkResVersion to set * @return this */ public Gateserver setMdkResVersion(final Utf8String value) { - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; mdkResVersion.copyFrom(value); return this; } /** - * optional string ifix_url = 1895; + * optional string ifix_url = 1113; * @return whether the ifixUrl field is set */ public boolean hasIfixUrl() { - return (bitField0_ & 0x00020000) != 0; + return (bitField0_ & 0x00004000) != 0; } /** - * optional string ifix_url = 1895; + * optional string ifix_url = 1113; * @return this */ public Gateserver clearIfixUrl() { - bitField0_ &= ~0x00020000; + bitField0_ &= ~0x00004000; ifixUrl.clear(); return this; } /** - * optional string ifix_url = 1895; + * optional string ifix_url = 1113; * @return the ifixUrl */ public String getIfixUrl() { @@ -1027,7 +851,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 1895; + * optional string ifix_url = 1113; * @return internal {@code Utf8String} representation of ifixUrl for reading */ public Utf8String getIfixUrlBytes() { @@ -1035,59 +859,282 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 1895; + * optional string ifix_url = 1113; * @return internal {@code Utf8String} representation of ifixUrl for modifications */ public Utf8String getMutableIfixUrlBytes() { - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; return this.ifixUrl; } /** - * optional string ifix_url = 1895; + * optional string ifix_url = 1113; * @param value the ifixUrl to set * @return this */ public Gateserver setIfixUrl(final CharSequence value) { - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; ifixUrl.copyFrom(value); return this; } /** - * optional string ifix_url = 1895; + * optional string ifix_url = 1113; * @param value the ifixUrl to set * @return this */ public Gateserver setIfixUrl(final Utf8String value) { - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; ifixUrl.copyFrom(value); return this; } + /** + * optional string msg = 1192; + * @return whether the msg field is set + */ + public boolean hasMsg() { + return (bitField0_ & 0x00008000) != 0; + } + + /** + * optional string msg = 1192; + * @return this + */ + public Gateserver clearMsg() { + bitField0_ &= ~0x00008000; + msg.clear(); + return this; + } + + /** + * optional string msg = 1192; + * @return the msg + */ + public String getMsg() { + return msg.getString(); + } + + /** + * optional string msg = 1192; + * @return internal {@code Utf8String} representation of msg for reading + */ + public Utf8String getMsgBytes() { + return this.msg; + } + + /** + * optional string msg = 1192; + * @return internal {@code Utf8String} representation of msg for modifications + */ + public Utf8String getMutableMsgBytes() { + bitField0_ |= 0x00008000; + return this.msg; + } + + /** + * optional string msg = 1192; + * @param value the msg to set + * @return this + */ + public Gateserver setMsg(final CharSequence value) { + bitField0_ |= 0x00008000; + msg.copyFrom(value); + return this; + } + + /** + * optional string msg = 1192; + * @param value the msg to set + * @return this + */ + public Gateserver setMsg(final Utf8String value) { + bitField0_ |= 0x00008000; + msg.copyFrom(value); + return this; + } + + /** + * 
+     *  guessed
+     *
+ * + * optional string ifix_version = 1430; + * @return whether the ifixVersion field is set + */ + public boolean hasIfixVersion() { + return (bitField0_ & 0x00010000) != 0; + } + + /** + * 
+     *  guessed
+     *
+ * + * optional string ifix_version = 1430; + * @return this + */ + public Gateserver clearIfixVersion() { + bitField0_ &= ~0x00010000; + ifixVersion.clear(); + return this; + } + + /** + * 
+     *  guessed
+     *
+ * + * optional string ifix_version = 1430; + * @return the ifixVersion + */ + public String getIfixVersion() { + return ifixVersion.getString(); + } + + /** + * 
+     *  guessed
+     *
+ * + * optional string ifix_version = 1430; + * @return internal {@code Utf8String} representation of ifixVersion for reading + */ + public Utf8String getIfixVersionBytes() { + return this.ifixVersion; + } + + /** + * 
+     *  guessed
+     *
+ * + * optional string ifix_version = 1430; + * @return internal {@code Utf8String} representation of ifixVersion for modifications + */ + public Utf8String getMutableIfixVersionBytes() { + bitField0_ |= 0x00010000; + return this.ifixVersion; + } + + /** + * 
+     *  guessed
+     *
+ * + * optional string ifix_version = 1430; + * @param value the ifixVersion to set + * @return this + */ + public Gateserver setIfixVersion(final CharSequence value) { + bitField0_ |= 0x00010000; + ifixVersion.copyFrom(value); + return this; + } + + /** + * 
+     *  guessed
+     *
+ * + * optional string ifix_version = 1430; + * @param value the ifixVersion to set + * @return this + */ + public Gateserver setIfixVersion(final Utf8String value) { + bitField0_ |= 0x00010000; + ifixVersion.copyFrom(value); + return this; + } + + /** + * optional string client_secret_key = 1808; + * @return whether the clientSecretKey field is set + */ + public boolean hasClientSecretKey() { + return (bitField0_ & 0x00020000) != 0; + } + + /** + * optional string client_secret_key = 1808; + * @return this + */ + public Gateserver clearClientSecretKey() { + bitField0_ &= ~0x00020000; + clientSecretKey.clear(); + return this; + } + + /** + * optional string client_secret_key = 1808; + * @return the clientSecretKey + */ + public String getClientSecretKey() { + return clientSecretKey.getString(); + } + + /** + * optional string client_secret_key = 1808; + * @return internal {@code Utf8String} representation of clientSecretKey for reading + */ + public Utf8String getClientSecretKeyBytes() { + return this.clientSecretKey; + } + + /** + * optional string client_secret_key = 1808; + * @return internal {@code Utf8String} representation of clientSecretKey for modifications + */ + public Utf8String getMutableClientSecretKeyBytes() { + bitField0_ |= 0x00020000; + return this.clientSecretKey; + } + + /** + * optional string client_secret_key = 1808; + * @param value the clientSecretKey to set + * @return this + */ + public Gateserver setClientSecretKey(final CharSequence value) { + bitField0_ |= 0x00020000; + clientSecretKey.copyFrom(value); + return this; + } + + /** + * optional string client_secret_key = 1808; + * @param value the clientSecretKey to set + * @return this + */ + public Gateserver setClientSecretKey(final Utf8String value) { + bitField0_ |= 0x00020000; + clientSecretKey.copyFrom(value); + return this; + } + @Override public Gateserver copyFrom(final Gateserver other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; port = other.port; - unk1 = other.unk1; - unk2 = other.unk2; - unk3 = other.unk3; - unk4 = other.unk4; - unk5 = other.unk5; - unk6 = other.unk6; - unk7 = other.unk7; - ip.copyFrom(other.ip); - luaUrl.copyFrom(other.luaUrl); - regionName.copyFrom(other.regionName); - exResourceUrl.copyFrom(other.exResourceUrl); + enableVersionUpdate = other.enableVersionUpdate; + enableDesignDataBundleVersionUpdate = other.enableDesignDataBundleVersionUpdate; + eventTrackingOpen = other.eventTrackingOpen; + enableAndroidMiddlePackage = other.enableAndroidMiddlePackage; + enableWatermark = other.enableWatermark; + closeRedeemCode = other.closeRedeemCode; + networkDiagnostic = other.networkDiagnostic; assetBundleUrl.copyFrom(other.assetBundleUrl); + ip.copyFrom(other.ip); + regionName.copyFrom(other.regionName); + luaUrl.copyFrom(other.luaUrl); + exResourceUrl.copyFrom(other.exResourceUrl); + mdkResVersion.copyFrom(other.mdkResVersion); + ifixUrl.copyFrom(other.ifixUrl); msg.copyFrom(other.msg); ifixVersion.copyFrom(other.ifixVersion); clientSecretKey.copyFrom(other.clientSecretKey); - mdkResVersion.copyFrom(other.mdkResVersion); - ifixUrl.copyFrom(other.ifixUrl); } return this; } @@ -1101,41 +1148,47 @@ public final class GateserverOuterClass { if (other.hasPort()) { setPort(other.port); } - if (other.hasUnk1()) { - setUnk1(other.unk1); + if (other.hasEnableVersionUpdate()) { + setEnableVersionUpdate(other.enableVersionUpdate); } - if (other.hasUnk2()) { - setUnk2(other.unk2); + if (other.hasEnableDesignDataBundleVersionUpdate()) { + setEnableDesignDataBundleVersionUpdate(other.enableDesignDataBundleVersionUpdate); } - if (other.hasUnk3()) { - setUnk3(other.unk3); + if (other.hasEventTrackingOpen()) { + setEventTrackingOpen(other.eventTrackingOpen); } - if (other.hasUnk4()) { - setUnk4(other.unk4); + if (other.hasEnableAndroidMiddlePackage()) { + setEnableAndroidMiddlePackage(other.enableAndroidMiddlePackage); } - if (other.hasUnk5()) { - setUnk5(other.unk5); + if (other.hasEnableWatermark()) { + setEnableWatermark(other.enableWatermark); } - if (other.hasUnk6()) { - setUnk6(other.unk6); + if (other.hasCloseRedeemCode()) { + setCloseRedeemCode(other.closeRedeemCode); } - if (other.hasUnk7()) { - setUnk7(other.unk7); + if (other.hasNetworkDiagnostic()) { + setNetworkDiagnostic(other.networkDiagnostic); + } + if (other.hasAssetBundleUrl()) { + getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); } if (other.hasIp()) { getMutableIpBytes().copyFrom(other.ip); } - if (other.hasLuaUrl()) { - getMutableLuaUrlBytes().copyFrom(other.luaUrl); - } if (other.hasRegionName()) { getMutableRegionNameBytes().copyFrom(other.regionName); } + if (other.hasLuaUrl()) { + getMutableLuaUrlBytes().copyFrom(other.luaUrl); + } if (other.hasExResourceUrl()) { getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); } - if (other.hasAssetBundleUrl()) { - getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); + if (other.hasMdkResVersion()) { + getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); + } + if (other.hasIfixUrl()) { + getMutableIfixUrlBytes().copyFrom(other.ifixUrl); } if (other.hasMsg()) { getMutableMsgBytes().copyFrom(other.msg); @@ -1146,12 +1199,6 @@ public final class GateserverOuterClass { if (other.hasClientSecretKey()) { getMutableClientSecretKeyBytes().copyFrom(other.clientSecretKey); } - if (other.hasMdkResVersion()) { - getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); - } - if (other.hasIfixUrl()) { - getMutableIfixUrlBytes().copyFrom(other.ifixUrl); - } return this; } @@ -1163,23 +1210,23 @@ public final class GateserverOuterClass { cachedSize = -1; bitField0_ = 0; port = 0; - unk1 = false; - unk2 = false; - unk3 = false; - unk4 = false; - unk5 = false; - unk6 = false; - unk7 = false; - ip.clear(); - luaUrl.clear(); - regionName.clear(); - exResourceUrl.clear(); + enableVersionUpdate = false; + enableDesignDataBundleVersionUpdate = false; + eventTrackingOpen = false; + enableAndroidMiddlePackage = false; + enableWatermark = false; + closeRedeemCode = false; + networkDiagnostic = false; assetBundleUrl.clear(); + ip.clear(); + regionName.clear(); + luaUrl.clear(); + exResourceUrl.clear(); + mdkResVersion.clear(); + ifixUrl.clear(); msg.clear(); ifixVersion.clear(); clientSecretKey.clear(); - mdkResVersion.clear(); - ifixUrl.clear(); return this; } @@ -1190,16 +1237,16 @@ public final class GateserverOuterClass { } cachedSize = -1; bitField0_ = 0; - ip.clear(); - luaUrl.clear(); - regionName.clear(); - exResourceUrl.clear(); assetBundleUrl.clear(); + ip.clear(); + regionName.clear(); + luaUrl.clear(); + exResourceUrl.clear(); + mdkResVersion.clear(); + ifixUrl.clear(); msg.clear(); ifixVersion.clear(); clientSecretKey.clear(); - mdkResVersion.clear(); - ifixUrl.clear(); return this; } @@ -1214,99 +1261,99 @@ public final class GateserverOuterClass { Gateserver other = (Gateserver) o; return bitField0_ == other.bitField0_ && (!hasPort() || port == other.port) - && (!hasUnk1() || unk1 == other.unk1) - && (!hasUnk2() || unk2 == other.unk2) - && (!hasUnk3() || unk3 == other.unk3) - && (!hasUnk4() || unk4 == other.unk4) - && (!hasUnk5() || unk5 == other.unk5) - && (!hasUnk6() || unk6 == other.unk6) - && (!hasUnk7() || unk7 == other.unk7) - && (!hasIp() || ip.equals(other.ip)) - && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) - && (!hasRegionName() || regionName.equals(other.regionName)) - && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) + && (!hasEnableVersionUpdate() || enableVersionUpdate == other.enableVersionUpdate) + && (!hasEnableDesignDataBundleVersionUpdate() || enableDesignDataBundleVersionUpdate == other.enableDesignDataBundleVersionUpdate) + && (!hasEventTrackingOpen() || eventTrackingOpen == other.eventTrackingOpen) + && (!hasEnableAndroidMiddlePackage() || enableAndroidMiddlePackage == other.enableAndroidMiddlePackage) + && (!hasEnableWatermark() || enableWatermark == other.enableWatermark) + && (!hasCloseRedeemCode() || closeRedeemCode == other.closeRedeemCode) + && (!hasNetworkDiagnostic() || networkDiagnostic == other.networkDiagnostic) && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) + && (!hasIp() || ip.equals(other.ip)) + && (!hasRegionName() || regionName.equals(other.regionName)) + && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) + && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) + && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion)) + && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl)) && (!hasMsg() || msg.equals(other.msg)) && (!hasIfixVersion() || ifixVersion.equals(other.ifixVersion)) - && (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey)) - && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion)) - && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl)); + && (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(port); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeBoolNoTag(unk1); + output.writeRawByte((byte) 8); + output.writeBoolNoTag(enableVersionUpdate); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeBoolNoTag(unk2); + output.writeRawByte((byte) 56); + output.writeBoolNoTag(enableDesignDataBundleVersionUpdate); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 1424); - output.writeBoolNoTag(unk3); + output.writeRawLittleEndian16((short) 6640); + output.writeBoolNoTag(eventTrackingOpen); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 11912); - output.writeBoolNoTag(unk4); + output.writeRawLittleEndian16((short) 9608); + output.writeBoolNoTag(enableAndroidMiddlePackage); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 16616); - output.writeBoolNoTag(unk5); + output.writeRawLittleEndian16((short) 23432); + output.writeBoolNoTag(enableWatermark); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawLittleEndian16((short) 22472); - output.writeBoolNoTag(unk6); + output.writeRawLittleEndian16((short) 23792); + output.writeBoolNoTag(closeRedeemCode); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawLittleEndian16((short) 29656); - output.writeBoolNoTag(unk7); + output.writeRawLittleEndian16((short) 25072); + output.writeBoolNoTag(networkDiagnostic); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 10); - output.writeStringNoTag(ip); + output.writeRawByte((byte) 26); + output.writeStringNoTag(assetBundleUrl); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 18); - output.writeStringNoTag(luaUrl); + output.writeRawByte((byte) 34); + output.writeStringNoTag(ip); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 42); output.writeStringNoTag(regionName); } if ((bitField0_ & 0x00000800) != 0) { + output.writeRawByte((byte) 82); + output.writeStringNoTag(luaUrl); + } + if ((bitField0_ & 0x00001000) != 0) { output.writeRawByte((byte) 114); output.writeStringNoTag(exResourceUrl); } - if ((bitField0_ & 0x00001000) != 0) { - output.writeRawByte((byte) 122); - output.writeStringNoTag(assetBundleUrl); - } if ((bitField0_ & 0x00002000) != 0) { - output.writeRawLittleEndian16((short) 6138); - output.writeStringNoTag(msg); - } - if ((bitField0_ & 0x00004000) != 0) { - output.writeRawLittleEndian16((short) 19402); - output.writeStringNoTag(ifixVersion); - } - if ((bitField0_ & 0x00008000) != 0) { - output.writeRawLittleEndian16((short) 25578); - output.writeStringNoTag(clientSecretKey); - } - if ((bitField0_ & 0x00010000) != 0) { - output.writeRawLittleEndian16((short) 28850); + output.writeRawLittleEndian16((short) 10666); output.writeStringNoTag(mdkResVersion); } - if ((bitField0_ & 0x00020000) != 0) { - output.writeRawLittleEndian16((short) 30394); + if ((bitField0_ & 0x00004000) != 0) { + output.writeRawLittleEndian16((short) 17866); output.writeStringNoTag(ifixUrl); } + if ((bitField0_ & 0x00008000) != 0) { + output.writeRawLittleEndian16((short) 19138); + output.writeStringNoTag(msg); + } + if ((bitField0_ & 0x00010000) != 0) { + output.writeRawLittleEndian16((short) 22962); + output.writeStringNoTag(ifixVersion); + } + if ((bitField0_ & 0x00020000) != 0) { + output.writeRawLittleEndian16((short) 29058); + output.writeStringNoTag(clientSecretKey); + } } @Override @@ -1337,35 +1384,35 @@ public final class GateserverOuterClass { size += 3; } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(ip); + size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(ip); } if ((bitField0_ & 0x00000400) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(regionName); } if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); } if ((bitField0_ & 0x00001000) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); } if ((bitField0_ & 0x00002000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(msg); - } - if ((bitField0_ & 0x00004000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); - } - if ((bitField0_ & 0x00008000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); - } - if ((bitField0_ & 0x00010000) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); } - if ((bitField0_ & 0x00020000) != 0) { + if ((bitField0_ & 0x00004000) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); } + if ((bitField0_ & 0x00008000) != 0) { + size += 2 + ProtoSink.computeStringSizeNoTag(msg); + } + if ((bitField0_ & 0x00010000) != 0) { + size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); + } + if ((bitField0_ & 0x00020000) != 0) { + size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); + } return size; } @@ -1376,100 +1423,109 @@ public final class GateserverOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 16: { // port port = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 8) { break; } } - case 48: { - // unk1 - unk1 = input.readBool(); + case 8: { + // enableVersionUpdate + enableVersionUpdate = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 56) { break; } } - case 104: { - // unk2 - unk2 = input.readBool(); + case 56: { + // enableDesignDataBundleVersionUpdate + enableDesignDataBundleVersionUpdate = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 656) { + if (tag != 3312) { break; } } - case 656: { - // unk3 - unk3 = input.readBool(); + case 3312: { + // eventTrackingOpen + eventTrackingOpen = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 5896) { + if (tag != 4744) { break; } } - case 5896: { - // unk4 - unk4 = input.readBool(); + case 4744: { + // enableAndroidMiddlePackage + enableAndroidMiddlePackage = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 8296) { + if (tag != 11656) { break; } } - case 8296: { - // unk5 - unk5 = input.readBool(); + case 11656: { + // enableWatermark + enableWatermark = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 11208) { + if (tag != 11888) { break; } } - case 11208: { - // unk6 - unk6 = input.readBool(); + case 11888: { + // closeRedeemCode + closeRedeemCode = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 14808) { + if (tag != 12528) { break; } } - case 14808: { - // unk7 - unk7 = input.readBool(); + case 12528: { + // networkDiagnostic + networkDiagnostic = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 10) { + if (tag != 26) { break; } } - case 10: { - // ip - input.readString(ip); + case 26: { + // assetBundleUrl + input.readString(assetBundleUrl); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 18) { + if (tag != 34) { break; } } - case 18: { - // luaUrl - input.readString(luaUrl); + case 34: { + // ip + input.readString(ip); bitField0_ |= 0x00000200; tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // regionName + input.readString(regionName); + bitField0_ |= 0x00000400; + tag = input.readTag(); if (tag != 82) { break; } } case 82: { - // regionName - input.readString(regionName); - bitField0_ |= 0x00000400; + // luaUrl + input.readString(luaUrl); + bitField0_ |= 0x00000800; tag = input.readTag(); if (tag != 114) { break; @@ -1478,60 +1534,51 @@ public final class GateserverOuterClass { case 114: { // exResourceUrl input.readString(exResourceUrl); - bitField0_ |= 0x00000800; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { - // assetBundleUrl - input.readString(assetBundleUrl); bitField0_ |= 0x00001000; tag = input.readTag(); - if (tag != 3066) { + if (tag != 5290) { break; } } - case 3066: { - // msg - input.readString(msg); - bitField0_ |= 0x00002000; - tag = input.readTag(); - if (tag != 9674) { - break; - } - } - case 9674: { - // ifixVersion - input.readString(ifixVersion); - bitField0_ |= 0x00004000; - tag = input.readTag(); - if (tag != 12778) { - break; - } - } - case 12778: { - // clientSecretKey - input.readString(clientSecretKey); - bitField0_ |= 0x00008000; - tag = input.readTag(); - if (tag != 14386) { - break; - } - } - case 14386: { + case 5290: { // mdkResVersion input.readString(mdkResVersion); - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; tag = input.readTag(); - if (tag != 15162) { + if (tag != 8906) { break; } } - case 15162: { + case 8906: { // ifixUrl input.readString(ifixUrl); + bitField0_ |= 0x00004000; + tag = input.readTag(); + if (tag != 9538) { + break; + } + } + case 9538: { + // msg + input.readString(msg); + bitField0_ |= 0x00008000; + tag = input.readTag(); + if (tag != 11442) { + break; + } + } + case 11442: { + // ifixVersion + input.readString(ifixVersion); + bitField0_ |= 0x00010000; + tag = input.readTag(); + if (tag != 14466) { + break; + } + } + case 14466: { + // clientSecretKey + input.readString(clientSecretKey); bitField0_ |= 0x00020000; tag = input.readTag(); if (tag != 0) { @@ -1559,56 +1606,56 @@ public final class GateserverOuterClass { output.writeUInt32(FieldNames.port, port); } if ((bitField0_ & 0x00000002) != 0) { - output.writeBool(FieldNames.unk1, unk1); + output.writeBool(FieldNames.enableVersionUpdate, enableVersionUpdate); } if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.unk2, unk2); + output.writeBool(FieldNames.enableDesignDataBundleVersionUpdate, enableDesignDataBundleVersionUpdate); } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.unk3, unk3); + output.writeBool(FieldNames.eventTrackingOpen, eventTrackingOpen); } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.unk4, unk4); + output.writeBool(FieldNames.enableAndroidMiddlePackage, enableAndroidMiddlePackage); } if ((bitField0_ & 0x00000020) != 0) { - output.writeBool(FieldNames.unk5, unk5); + output.writeBool(FieldNames.enableWatermark, enableWatermark); } if ((bitField0_ & 0x00000040) != 0) { - output.writeBool(FieldNames.unk6, unk6); + output.writeBool(FieldNames.closeRedeemCode, closeRedeemCode); } if ((bitField0_ & 0x00000080) != 0) { - output.writeBool(FieldNames.unk7, unk7); + output.writeBool(FieldNames.networkDiagnostic, networkDiagnostic); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.ip, ip); + output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); } if ((bitField0_ & 0x00000200) != 0) { - output.writeString(FieldNames.luaUrl, luaUrl); + output.writeString(FieldNames.ip, ip); } if ((bitField0_ & 0x00000400) != 0) { output.writeString(FieldNames.regionName, regionName); } if ((bitField0_ & 0x00000800) != 0) { - output.writeString(FieldNames.exResourceUrl, exResourceUrl); + output.writeString(FieldNames.luaUrl, luaUrl); } if ((bitField0_ & 0x00001000) != 0) { - output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); + output.writeString(FieldNames.exResourceUrl, exResourceUrl); } if ((bitField0_ & 0x00002000) != 0) { - output.writeString(FieldNames.msg, msg); - } - if ((bitField0_ & 0x00004000) != 0) { - output.writeString(FieldNames.ifixVersion, ifixVersion); - } - if ((bitField0_ & 0x00008000) != 0) { - output.writeString(FieldNames.clientSecretKey, clientSecretKey); - } - if ((bitField0_ & 0x00010000) != 0) { output.writeString(FieldNames.mdkResVersion, mdkResVersion); } - if ((bitField0_ & 0x00020000) != 0) { + if ((bitField0_ & 0x00004000) != 0) { output.writeString(FieldNames.ifixUrl, ifixUrl); } + if ((bitField0_ & 0x00008000) != 0) { + output.writeString(FieldNames.msg, msg); + } + if ((bitField0_ & 0x00010000) != 0) { + output.writeString(FieldNames.ifixVersion, ifixVersion); + } + if ((bitField0_ & 0x00020000) != 0) { + output.writeString(FieldNames.clientSecretKey, clientSecretKey); + } output.endObject(); } @@ -1630,10 +1677,11 @@ public final class GateserverOuterClass { } break; } - case 3594623: { - if (input.isAtField(FieldNames.unk1)) { + case -349989122: + case 531540044: { + if (input.isAtField(FieldNames.enableVersionUpdate)) { if (!input.trySkipNullValue()) { - unk1 = input.readBool(); + enableVersionUpdate = input.readBool(); bitField0_ |= 0x00000002; } } else { @@ -1641,10 +1689,11 @@ public final class GateserverOuterClass { } break; } - case 3594624: { - if (input.isAtField(FieldNames.unk2)) { + case -467618828: + case -1343541251: { + if (input.isAtField(FieldNames.enableDesignDataBundleVersionUpdate)) { if (!input.trySkipNullValue()) { - unk2 = input.readBool(); + enableDesignDataBundleVersionUpdate = input.readBool(); bitField0_ |= 0x00000004; } } else { @@ -1652,10 +1701,11 @@ public final class GateserverOuterClass { } break; } - case 3594625: { - if (input.isAtField(FieldNames.unk3)) { + case -100911781: + case 1870727661: { + if (input.isAtField(FieldNames.eventTrackingOpen)) { if (!input.trySkipNullValue()) { - unk3 = input.readBool(); + eventTrackingOpen = input.readBool(); bitField0_ |= 0x00000008; } } else { @@ -1663,10 +1713,11 @@ public final class GateserverOuterClass { } break; } - case 3594626: { - if (input.isAtField(FieldNames.unk4)) { + case 583307493: + case 986526120: { + if (input.isAtField(FieldNames.enableAndroidMiddlePackage)) { if (!input.trySkipNullValue()) { - unk4 = input.readBool(); + enableAndroidMiddlePackage = input.readBool(); bitField0_ |= 0x00000010; } } else { @@ -1674,10 +1725,11 @@ public final class GateserverOuterClass { } break; } - case 3594627: { - if (input.isAtField(FieldNames.unk5)) { + case 1857218081: + case 364560552: { + if (input.isAtField(FieldNames.enableWatermark)) { if (!input.trySkipNullValue()) { - unk5 = input.readBool(); + enableWatermark = input.readBool(); bitField0_ |= 0x00000020; } } else { @@ -1685,10 +1737,11 @@ public final class GateserverOuterClass { } break; } - case 3594628: { - if (input.isAtField(FieldNames.unk6)) { + case -1962061375: + case -264284439: { + if (input.isAtField(FieldNames.closeRedeemCode)) { if (!input.trySkipNullValue()) { - unk6 = input.readBool(); + closeRedeemCode = input.readBool(); bitField0_ |= 0x00000040; } } else { @@ -1696,10 +1749,11 @@ public final class GateserverOuterClass { } break; } - case 3594629: { - if (input.isAtField(FieldNames.unk7)) { + case -1960857483: + case -2044113320: { + if (input.isAtField(FieldNames.networkDiagnostic)) { if (!input.trySkipNullValue()) { - unk7 = input.readBool(); + networkDiagnostic = input.readBool(); bitField0_ |= 0x00000080; } } else { @@ -1707,22 +1761,22 @@ public final class GateserverOuterClass { } break; } + case -1116358531: + case 1973569761: { + if (input.isAtField(FieldNames.assetBundleUrl)) { + if (!input.trySkipNullValue()) { + input.readString(assetBundleUrl); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } case 3367: { if (input.isAtField(FieldNames.ip)) { if (!input.trySkipNullValue()) { input.readString(ip); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1091991977: - case 508288168: { - if (input.isAtField(FieldNames.luaUrl)) { - if (!input.trySkipNullValue()) { - input.readString(luaUrl); bitField0_ |= 0x00000200; } } else { @@ -1742,11 +1796,11 @@ public final class GateserverOuterClass { } break; } - case 1643520974: - case -1086137910: { - if (input.isAtField(FieldNames.exResourceUrl)) { + case -1091991977: + case 508288168: { + if (input.isAtField(FieldNames.luaUrl)) { if (!input.trySkipNullValue()) { - input.readString(exResourceUrl); + input.readString(luaUrl); bitField0_ |= 0x00000800; } } else { @@ -1754,11 +1808,11 @@ public final class GateserverOuterClass { } break; } - case -1116358531: - case 1973569761: { - if (input.isAtField(FieldNames.assetBundleUrl)) { + case 1643520974: + case -1086137910: { + if (input.isAtField(FieldNames.exResourceUrl)) { if (!input.trySkipNullValue()) { - input.readString(assetBundleUrl); + input.readString(exResourceUrl); bitField0_ |= 0x00001000; } } else { @@ -1766,47 +1820,12 @@ public final class GateserverOuterClass { } break; } - case 108417: { - if (input.isAtField(FieldNames.msg)) { - if (!input.trySkipNullValue()) { - input.readString(msg); - bitField0_ |= 0x00002000; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1625073708: - case -827048283: { - if (input.isAtField(FieldNames.ifixVersion)) { - if (!input.trySkipNullValue()) { - input.readString(ifixVersion); - bitField0_ |= 0x00004000; - } - } else { - input.skipUnknownField(); - } - break; - } - case -584558076: - case 904194372: { - if (input.isAtField(FieldNames.clientSecretKey)) { - if (!input.trySkipNullValue()) { - input.readString(clientSecretKey); - bitField0_ |= 0x00008000; - } - } else { - input.skipUnknownField(); - } - break; - } case -1415579412: case -204279250: { if (input.isAtField(FieldNames.mdkResVersion)) { if (!input.trySkipNullValue()) { input.readString(mdkResVersion); - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; } } else { input.skipUnknownField(); @@ -1818,6 +1837,41 @@ public final class GateserverOuterClass { if (input.isAtField(FieldNames.ifixUrl)) { if (!input.trySkipNullValue()) { input.readString(ifixUrl); + bitField0_ |= 0x00004000; + } + } else { + input.skipUnknownField(); + } + break; + } + case 108417: { + if (input.isAtField(FieldNames.msg)) { + if (!input.trySkipNullValue()) { + input.readString(msg); + bitField0_ |= 0x00008000; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1625073708: + case -827048283: { + if (input.isAtField(FieldNames.ifixVersion)) { + if (!input.trySkipNullValue()) { + input.readString(ifixVersion); + bitField0_ |= 0x00010000; + } + } else { + input.skipUnknownField(); + } + break; + } + case -584558076: + case 904194372: { + if (input.isAtField(FieldNames.clientSecretKey)) { + if (!input.trySkipNullValue()) { + input.readString(clientSecretKey); bitField0_ |= 0x00020000; } } else { @@ -1879,39 +1933,39 @@ public final class GateserverOuterClass { static class FieldNames { static final FieldName port = FieldName.forField("port"); - static final FieldName unk1 = FieldName.forField("unk1"); + static final FieldName enableVersionUpdate = FieldName.forField("enableVersionUpdate", "enable_version_update"); - static final FieldName unk2 = FieldName.forField("unk2"); + static final FieldName enableDesignDataBundleVersionUpdate = FieldName.forField("enableDesignDataBundleVersionUpdate", "enable_design_data_bundle_version_update"); - static final FieldName unk3 = FieldName.forField("unk3"); + static final FieldName eventTrackingOpen = FieldName.forField("eventTrackingOpen", "event_tracking_open"); - static final FieldName unk4 = FieldName.forField("unk4"); + static final FieldName enableAndroidMiddlePackage = FieldName.forField("enableAndroidMiddlePackage", "enable_android_middle_package"); - static final FieldName unk5 = FieldName.forField("unk5"); + static final FieldName enableWatermark = FieldName.forField("enableWatermark", "enable_watermark"); - static final FieldName unk6 = FieldName.forField("unk6"); + static final FieldName closeRedeemCode = FieldName.forField("closeRedeemCode", "close_redeem_code"); - static final FieldName unk7 = FieldName.forField("unk7"); + static final FieldName networkDiagnostic = FieldName.forField("networkDiagnostic", "network_diagnostic"); + + static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url"); static final FieldName ip = FieldName.forField("ip"); - static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url"); - static final FieldName regionName = FieldName.forField("regionName", "region_name"); + 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 mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); + + static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url"); static final FieldName msg = FieldName.forField("msg"); static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version"); static final FieldName clientSecretKey = FieldName.forField("clientSecretKey", "client_secret_key"); - - static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); - - static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GenderOuterClass.java b/src/generated/main/emu/lunarcore/proto/GenderOuterClass.java index 808744d..5e3f533 100644 --- a/src/generated/main/emu/lunarcore/proto/GenderOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GenderOuterClass.java @@ -67,7 +67,7 @@ public final class GenderOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return GenderConverter.INSTANCE; } @@ -89,7 +89,7 @@ public final class GenderOuterClass { return value == null ? other : value; } - enum GenderConverter implements EnumConverter { + enum GenderConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final Gender[] lookup = new Gender[3]; diff --git a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java index 9a6fe07..e7f545b 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 = 11; */ private int retcode; /** - * repeated .ActivityScheduleInfo activity_schedule_list = 15; + * repeated .ActivityScheduleInfo activity_schedule_list = 6; */ private final RepeatedMessage activityScheduleList = RepeatedMessage.newEmptyInstance(ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 11; * @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 = 11; * @return this */ public GetActivityScheduleConfigScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 15; + * repeated .ActivityScheduleInfo activity_schedule_list = 6; * @return whether the activityScheduleList field is set */ public boolean hasActivityScheduleList() { @@ -85,7 +85,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 15; + * repeated .ActivityScheduleInfo activity_schedule_list = 6; * @return this */ public GetActivityScheduleConfigScRsp clearActivityScheduleList() { @@ -95,7 +95,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 15; + * repeated .ActivityScheduleInfo activity_schedule_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. @@ -110,7 +110,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 15; + * repeated .ActivityScheduleInfo activity_schedule_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 @@ -125,7 +125,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 15; + * repeated .ActivityScheduleInfo activity_schedule_list = 6; * @param value the activityScheduleList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 15; + * repeated .ActivityScheduleInfo activity_schedule_list = 6; * @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) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < activityScheduleList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 50); output.writeMessageNoTag(activityScheduleList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetActivityScheduleConfigScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 50) { break; } } - case 122: { + case 50: { // 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 0de7aae..1856ae1 100644 --- a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetAllLineupDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_index = 4; + * optional uint32 cur_index = 1; */ private int curIndex; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; */ private int retcode; /** - * repeated .LineupInfo lineup_list = 3; + * repeated .LineupInfo lineup_list = 6; */ private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); @@ -45,7 +45,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 4; + * optional uint32 cur_index = 1; * @return whether the curIndex field is set */ public boolean hasCurIndex() { @@ -53,7 +53,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 4; + * optional uint32 cur_index = 1; * @return this */ public GetAllLineupDataScRsp clearCurIndex() { @@ -63,7 +63,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 4; + * optional uint32 cur_index = 1; * @return the curIndex */ public int getCurIndex() { @@ -71,7 +71,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 4; + * optional uint32 cur_index = 1; * @param value the curIndex to set * @return this */ @@ -82,7 +82,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -90,7 +90,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return this */ public GetAllLineupDataScRsp clearRetcode() { @@ -100,7 +100,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -108,7 +108,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 3; + * repeated .LineupInfo lineup_list = 6; * @return whether the lineupList field is set */ public boolean hasLineupList() { @@ -127,7 +127,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 3; + * repeated .LineupInfo lineup_list = 6; * @return this */ public GetAllLineupDataScRsp clearLineupList() { @@ -137,7 +137,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 3; + * repeated .LineupInfo lineup_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 3; + * repeated .LineupInfo lineup_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 3; + * repeated .LineupInfo lineup_list = 6; * @param value the lineupList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 3; + * repeated .LineupInfo lineup_list = 6; * @param values the lineupList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetAllLineupDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(curIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < lineupList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 50); output.writeMessageNoTag(lineupList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetAllLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { // curIndex curIndex = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 50) { break; } } - case 26: { + case 50: { // lineupList tag = input.readRepeatedMessage(lineupList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java index e68e447..775ddb9 100644 --- a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java @@ -24,7 +24,7 @@ public final class GetArchiveDataScRspOuterClass { private int retcode; /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 3; */ private final ArchiveDataOuterClass.ArchiveData archiveData = ArchiveDataOuterClass.ArchiveData.newInstance(); @@ -76,7 +76,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 3; * @return whether the archiveData field is set */ public boolean hasArchiveData() { @@ -84,7 +84,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 3; * @return this */ public GetArchiveDataScRsp clearArchiveData() { @@ -94,7 +94,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_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. @@ -108,7 +108,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_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 @@ -122,7 +122,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 1; + * optional .ArchiveData archive_data = 3; * @param value the archiveData to set * @return this */ @@ -202,7 +202,7 @@ public final class GetArchiveDataScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 26); output.writeMessageNoTag(archiveData); } } @@ -231,11 +231,11 @@ public final class GetArchiveDataScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 26) { break; } } - case 10: { + case 26: { // 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 7677843..2c666cf 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 = 12; + * optional bool is_get_all = 3; */ private boolean isGetAll; /** - * repeated uint32 base_avatar_id_list = 10; + * repeated uint32 base_avatar_id_list = 1; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 12; + * optional bool is_get_all = 3; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -48,7 +48,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 12; + * optional bool is_get_all = 3; * @return this */ public GetAvatarDataCsReq clearIsGetAll() { @@ -58,7 +58,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 12; + * optional bool is_get_all = 3; * @return the isGetAll */ public boolean getIsGetAll() { @@ -66,7 +66,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 12; + * optional bool is_get_all = 3; * @param value the isGetAll to set * @return this */ @@ -77,7 +77,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 10; + * repeated uint32 base_avatar_id_list = 1; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -85,7 +85,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 10; + * repeated uint32 base_avatar_id_list = 1; * @return this */ public GetAvatarDataCsReq clearBaseAvatarIdList() { @@ -95,7 +95,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 10; + * repeated uint32 base_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. @@ -109,7 +109,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 10; + * repeated uint32 base_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 @@ -123,7 +123,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 10; + * repeated uint32 base_avatar_id_list = 1; * @param value the baseAvatarIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 10; + * repeated uint32 base_avatar_id_list = 1; * @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) 96); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetAvatarDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 24: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 10) { break; } } - case 82: { + case 10: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetAvatarDataCsReqOuterClass { tag = input.readTag(); break; } - case 80: { + case 8: { // 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 92d2912..a83582b 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 = 3; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional bool is_get_all = 14; + * optional bool is_get_all = 4; */ private boolean isGetAll; /** - * repeated .Avatar avatar_list = 15; + * repeated .Avatar avatar_list = 13; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -45,7 +45,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 14; * @return this */ public GetAvatarDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 14; + * optional bool is_get_all = 4; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -90,7 +90,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 14; + * optional bool is_get_all = 4; * @return this */ public GetAvatarDataScRsp clearIsGetAll() { @@ -100,7 +100,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 14; + * optional bool is_get_all = 4; * @return the isGetAll */ public boolean getIsGetAll() { @@ -108,7 +108,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 14; + * optional bool is_get_all = 4; * @param value the isGetAll to set * @return this */ @@ -119,7 +119,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 15; + * repeated .Avatar avatar_list = 13; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 15; + * repeated .Avatar avatar_list = 13; * @return this */ public GetAvatarDataScRsp clearAvatarList() { @@ -137,7 +137,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 15; + * repeated .Avatar avatar_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 GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 15; + * repeated .Avatar avatar_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 GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 15; + * repeated .Avatar avatar_list = 13; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 15; + * repeated .Avatar avatar_list = 13; * @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) 24); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 106); output.writeMessageNoTag(avatarList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetAvatarDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 32) { break; } } - case 112: { + case 32: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { + case 106: { // 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 8af9b37..82c448b 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.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 GetBagScRspOuterClass { @@ -20,25 +21,30 @@ public final class GetBagScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; */ private int retcode; /** - * repeated .Relic relic_list = 9; + * repeated uint32 pet_list = 2; */ - private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); + private final RepeatedInt petList = RepeatedInt.newEmptyInstance(); /** - * repeated .Material material_list = 10; + * repeated .Material material_list = 1; */ private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); /** - * repeated .Equipment equipment_list = 14; + * repeated .Equipment equipment_list = 6; */ private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + /** + * repeated .Relic relic_list = 10; + */ + private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); + private GetBagScRsp() { } @@ -50,7 +56,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +64,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return this */ public GetBagScRsp clearRetcode() { @@ -68,7 +74,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -76,7 +82,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -87,39 +93,39 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Relic relic_list = 9; - * @return whether the relicList field is set + * repeated uint32 pet_list = 2; + * @return whether the petList field is set */ - public boolean hasRelicList() { + public boolean hasPetList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .Relic relic_list = 9; + * repeated uint32 pet_list = 2; * @return this */ - public GetBagScRsp clearRelicList() { + public GetBagScRsp clearPetList() { bitField0_ &= ~0x00000002; - relicList.clear(); + petList.clear(); return this; } /** - * repeated .Relic relic_list = 9; + * repeated uint32 pet_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 #getMutableRelicList()} if you want to modify it. + * Use {@link #getMutablePetList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getRelicList() { - return relicList; + public RepeatedInt getPetList() { + return petList; } /** - * repeated .Relic relic_list = 9; + * repeated uint32 pet_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 @@ -127,35 +133,35 @@ public final class GetBagScRspOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableRelicList() { + public RepeatedInt getMutablePetList() { bitField0_ |= 0x00000002; - return relicList; + return petList; } /** - * repeated .Relic relic_list = 9; - * @param value the relicList to add + * repeated uint32 pet_list = 2; + * @param value the petList to add * @return this */ - public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { + public GetBagScRsp addPetList(final int value) { bitField0_ |= 0x00000002; - relicList.add(value); + petList.add(value); return this; } /** - * repeated .Relic relic_list = 9; - * @param values the relicList to add + * repeated uint32 pet_list = 2; + * @param values the petList to add * @return this */ - public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { + public GetBagScRsp addAllPetList(final int... values) { bitField0_ |= 0x00000002; - relicList.addAll(values); + petList.addAll(values); return this; } /** - * repeated .Material material_list = 10; + * repeated .Material material_list = 1; * @return whether the materialList field is set */ public boolean hasMaterialList() { @@ -163,7 +169,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Material material_list = 10; + * repeated .Material material_list = 1; * @return this */ public GetBagScRsp clearMaterialList() { @@ -173,7 +179,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Material material_list = 10; + * repeated .Material material_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. @@ -187,7 +193,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Material material_list = 10; + * repeated .Material material_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 @@ -201,7 +207,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Material material_list = 10; + * repeated .Material material_list = 1; * @param value the materialList to add * @return this */ @@ -212,7 +218,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Material material_list = 10; + * repeated .Material material_list = 1; * @param values the materialList to add * @return this */ @@ -223,7 +229,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 14; + * repeated .Equipment equipment_list = 6; * @return whether the equipmentList field is set */ public boolean hasEquipmentList() { @@ -231,7 +237,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 14; + * repeated .Equipment equipment_list = 6; * @return this */ public GetBagScRsp clearEquipmentList() { @@ -241,7 +247,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 14; + * repeated .Equipment equipment_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -255,7 +261,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 14; + * repeated .Equipment equipment_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -269,7 +275,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 14; + * repeated .Equipment equipment_list = 6; * @param value the equipmentList to add * @return this */ @@ -280,7 +286,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 14; + * repeated .Equipment equipment_list = 6; * @param values the equipmentList to add * @return this */ @@ -290,15 +296,84 @@ public final class GetBagScRspOuterClass { return this; } + /** + * repeated .Relic relic_list = 10; + * @return whether the relicList field is set + */ + public boolean hasRelicList() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated .Relic relic_list = 10; + * @return this + */ + public GetBagScRsp clearRelicList() { + bitField0_ &= ~0x00000010; + relicList.clear(); + return this; + } + + /** + * repeated .Relic 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. + * + * Use {@link #getMutableRelicList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getRelicList() { + return relicList; + } + + /** + * repeated .Relic 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableRelicList() { + bitField0_ |= 0x00000010; + return relicList; + } + + /** + * repeated .Relic relic_list = 10; + * @param value the relicList to add + * @return this + */ + public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { + bitField0_ |= 0x00000010; + relicList.add(value); + return this; + } + + /** + * repeated .Relic relic_list = 10; + * @param values the relicList to add + * @return this + */ + public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { + bitField0_ |= 0x00000010; + 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; - relicList.copyFrom(other.relicList); + petList.copyFrom(other.petList); materialList.copyFrom(other.materialList); equipmentList.copyFrom(other.equipmentList); + relicList.copyFrom(other.relicList); } return this; } @@ -312,8 +387,8 @@ public final class GetBagScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasRelicList()) { - getMutableRelicList().addAll(other.relicList); + if (other.hasPetList()) { + getMutablePetList().addAll(other.petList); } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); @@ -321,6 +396,9 @@ public final class GetBagScRspOuterClass { if (other.hasEquipmentList()) { getMutableEquipmentList().addAll(other.equipmentList); } + if (other.hasRelicList()) { + getMutableRelicList().addAll(other.relicList); + } return this; } @@ -332,9 +410,10 @@ public final class GetBagScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - relicList.clear(); + petList.clear(); materialList.clear(); equipmentList.clear(); + relicList.clear(); return this; } @@ -345,9 +424,10 @@ public final class GetBagScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - relicList.clearQuick(); + petList.clear(); materialList.clearQuick(); equipmentList.clearQuick(); + relicList.clearQuick(); return this; } @@ -362,35 +442,42 @@ public final class GetBagScRspOuterClass { GetBagScRsp other = (GetBagScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasRelicList() || relicList.equals(other.relicList)) + && (!hasPetList() || petList.equals(other.petList)) && (!hasMaterialList() || materialList.equals(other.materialList)) - && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)); + && (!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) 56); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < petList.length(); i++) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(petList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 10); output.writeMessageNoTag(materialList.get(i)); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 50); output.writeMessageNoTag(equipmentList.get(i)); } } + if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < relicList.length(); i++) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(relicList.get(i)); + } + } } @Override @@ -400,7 +487,7 @@ public final class GetBagScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * petList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(petList); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); @@ -408,6 +495,9 @@ public final class GetBagScRspOuterClass { if ((bitField0_ & 0x00000008) != 0) { size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } + if ((bitField0_ & 0x00000010) != 0) { + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + } return size; } @@ -418,35 +508,44 @@ public final class GetBagScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 18) { break; } } - case 74: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); + case 18: { + // petList [packed=true] + input.readPackedUInt32(petList, tag); bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // materialList + tag = input.readRepeatedMessage(materialList, tag); + bitField0_ |= 0x00000004; + if (tag != 50) { + break; + } + } + case 50: { + // equipmentList + tag = input.readRepeatedMessage(equipmentList, tag); + bitField0_ |= 0x00000008; if (tag != 82) { break; } } case 82: { - // materialList - tag = input.readRepeatedMessage(materialList, tag); - bitField0_ |= 0x00000004; - if (tag != 114) { - break; - } - } - case 114: { - // equipmentList - tag = input.readRepeatedMessage(equipmentList, tag); - bitField0_ |= 0x00000008; + // relicList + tag = input.readRepeatedMessage(relicList, tag); + bitField0_ |= 0x00000010; if (tag != 0) { break; } @@ -461,6 +560,12 @@ public final class GetBagScRspOuterClass { tag = input.readTag(); break; } + case 16: { + // petList [packed=false] + tag = input.readRepeatedUInt32(petList, tag); + bitField0_ |= 0x00000002; + break; + } } } } @@ -472,7 +577,7 @@ public final class GetBagScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedUInt32(FieldNames.petList, petList); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.materialList, materialList); @@ -480,6 +585,9 @@ public final class GetBagScRspOuterClass { if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedMessage(FieldNames.relicList, relicList); + } output.endObject(); } @@ -501,11 +609,11 @@ public final class GetBagScRspOuterClass { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { + case -677761443: + case 481858494: { + if (input.isAtField(FieldNames.petList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); + input.readRepeatedUInt32(petList); bitField0_ |= 0x00000002; } } else { @@ -537,6 +645,18 @@ public final class GetBagScRspOuterClass { } break; } + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(relicList); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -591,11 +711,13 @@ public final class GetBagScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); + static final FieldName petList = FieldName.forField("petList", "pet_list"); static final FieldName materialList = FieldName.forField("materialList", "material_list"); static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); + + static final FieldName relicList = FieldName.forField("relicList", "relic_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java index 64c9114..1f1fcd5 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java @@ -19,52 +19,52 @@ public final class GetBasicInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 next_recover_time = 6; + * optional int64 next_recover_time = 8; */ private long nextRecoverTime; /** - * optional int64 last_set_nickname_time = 15; + * optional int64 last_set_nickname_time = 13; */ private long lastSetNicknameTime; /** - * optional uint32 cur_day = 2; - */ - private int curDay; - - /** - * optional uint32 gameplay_birthday = 8; + * optional uint32 gameplay_birthday = 2; */ private int gameplayBirthday; /** - * optional uint32 week_cocoon_finished_count = 10; - */ - private int weekCocoonFinishedCount; - - /** - * optional uint32 exchange_times = 11; - */ - private int exchangeTimes; - - /** - * optional uint32 retcode = 12; - */ - private int retcode; - - /** - * optional uint32 gender = 14; + * optional uint32 gender = 4; */ private int gender; /** - * optional bool is_gender_set = 9; + * optional uint32 week_cocoon_finished_count = 5; + */ + private int weekCocoonFinishedCount; + + /** + * optional uint32 cur_day = 10; + */ + private int curDay; + + /** + * optional uint32 retcode = 11; + */ + private int retcode; + + /** + * optional uint32 exchange_times = 14; + */ + private int exchangeTimes; + + /** + * optional bool is_gender_set = 7; */ private boolean isGenderSet; /** - * optional .PlayerSettingInfo player_setting_info = 4; + * optional .PlayerSettingInfo player_setting_info = 1; */ private final PlayerSettingInfoOuterClass.PlayerSettingInfo playerSettingInfo = PlayerSettingInfoOuterClass.PlayerSettingInfo.newInstance(); @@ -79,7 +79,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 6; + * optional int64 next_recover_time = 8; * @return whether the nextRecoverTime field is set */ public boolean hasNextRecoverTime() { @@ -87,7 +87,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 6; + * optional int64 next_recover_time = 8; * @return this */ public GetBasicInfoScRsp clearNextRecoverTime() { @@ -97,7 +97,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 6; + * optional int64 next_recover_time = 8; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -105,7 +105,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 6; + * optional int64 next_recover_time = 8; * @param value the nextRecoverTime to set * @return this */ @@ -116,7 +116,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 15; + * optional int64 last_set_nickname_time = 13; * @return whether the lastSetNicknameTime field is set */ public boolean hasLastSetNicknameTime() { @@ -124,7 +124,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 15; + * optional int64 last_set_nickname_time = 13; * @return this */ public GetBasicInfoScRsp clearLastSetNicknameTime() { @@ -134,7 +134,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 15; + * optional int64 last_set_nickname_time = 13; * @return the lastSetNicknameTime */ public long getLastSetNicknameTime() { @@ -142,7 +142,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 15; + * optional int64 last_set_nickname_time = 13; * @param value the lastSetNicknameTime to set * @return this */ @@ -153,62 +153,25 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 cur_day = 2; - * @return whether the curDay field is set + * optional uint32 gameplay_birthday = 2; + * @return whether the gameplayBirthday field is set */ - public boolean hasCurDay() { + public boolean hasGameplayBirthday() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 cur_day = 2; - * @return this - */ - public GetBasicInfoScRsp clearCurDay() { - bitField0_ &= ~0x00000004; - curDay = 0; - return this; - } - - /** - * optional uint32 cur_day = 2; - * @return the curDay - */ - public int getCurDay() { - return curDay; - } - - /** - * optional uint32 cur_day = 2; - * @param value the curDay to set - * @return this - */ - public GetBasicInfoScRsp setCurDay(final int value) { - bitField0_ |= 0x00000004; - curDay = value; - return this; - } - - /** - * optional uint32 gameplay_birthday = 8; - * @return whether the gameplayBirthday field is set - */ - public boolean hasGameplayBirthday() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 gameplay_birthday = 8; + * optional uint32 gameplay_birthday = 2; * @return this */ public GetBasicInfoScRsp clearGameplayBirthday() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; gameplayBirthday = 0; return this; } /** - * optional uint32 gameplay_birthday = 8; + * optional uint32 gameplay_birthday = 2; * @return the gameplayBirthday */ public int getGameplayBirthday() { @@ -216,18 +179,55 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 gameplay_birthday = 8; + * optional uint32 gameplay_birthday = 2; * @param value the gameplayBirthday to set * @return this */ public GetBasicInfoScRsp setGameplayBirthday(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; gameplayBirthday = value; return this; } /** - * optional uint32 week_cocoon_finished_count = 10; + * optional uint32 gender = 4; + * @return whether the gender field is set + */ + public boolean hasGender() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 gender = 4; + * @return this + */ + public GetBasicInfoScRsp clearGender() { + bitField0_ &= ~0x00000008; + gender = 0; + return this; + } + + /** + * optional uint32 gender = 4; + * @return the gender + */ + public int getGender() { + return gender; + } + + /** + * optional uint32 gender = 4; + * @param value the gender to set + * @return this + */ + public GetBasicInfoScRsp setGender(final int value) { + bitField0_ |= 0x00000008; + gender = value; + return this; + } + + /** + * optional uint32 week_cocoon_finished_count = 5; * @return whether the weekCocoonFinishedCount field is set */ public boolean hasWeekCocoonFinishedCount() { @@ -235,7 +235,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 week_cocoon_finished_count = 10; + * optional uint32 week_cocoon_finished_count = 5; * @return this */ public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { @@ -245,7 +245,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 week_cocoon_finished_count = 10; + * optional uint32 week_cocoon_finished_count = 5; * @return the weekCocoonFinishedCount */ public int getWeekCocoonFinishedCount() { @@ -253,7 +253,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 week_cocoon_finished_count = 10; + * optional uint32 week_cocoon_finished_count = 5; * @param value the weekCocoonFinishedCount to set * @return this */ @@ -264,44 +264,44 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 exchange_times = 11; - * @return whether the exchangeTimes field is set + * optional uint32 cur_day = 10; + * @return whether the curDay field is set */ - public boolean hasExchangeTimes() { + public boolean hasCurDay() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 exchange_times = 11; + * optional uint32 cur_day = 10; * @return this */ - public GetBasicInfoScRsp clearExchangeTimes() { + public GetBasicInfoScRsp clearCurDay() { bitField0_ &= ~0x00000020; - exchangeTimes = 0; + curDay = 0; return this; } /** - * optional uint32 exchange_times = 11; - * @return the exchangeTimes + * optional uint32 cur_day = 10; + * @return the curDay */ - public int getExchangeTimes() { - return exchangeTimes; + public int getCurDay() { + return curDay; } /** - * optional uint32 exchange_times = 11; - * @param value the exchangeTimes to set + * optional uint32 cur_day = 10; + * @param value the curDay to set * @return this */ - public GetBasicInfoScRsp setExchangeTimes(final int value) { + public GetBasicInfoScRsp setCurDay(final int value) { bitField0_ |= 0x00000020; - exchangeTimes = value; + curDay = value; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -309,7 +309,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return this */ public GetBasicInfoScRsp clearRetcode() { @@ -319,7 +319,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -327,7 +327,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -338,44 +338,44 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 gender = 14; - * @return whether the gender field is set + * optional uint32 exchange_times = 14; + * @return whether the exchangeTimes field is set */ - public boolean hasGender() { + public boolean hasExchangeTimes() { return (bitField0_ & 0x00000080) != 0; } /** - * optional uint32 gender = 14; + * optional uint32 exchange_times = 14; * @return this */ - public GetBasicInfoScRsp clearGender() { + public GetBasicInfoScRsp clearExchangeTimes() { bitField0_ &= ~0x00000080; - gender = 0; + exchangeTimes = 0; return this; } /** - * optional uint32 gender = 14; - * @return the gender + * optional uint32 exchange_times = 14; + * @return the exchangeTimes */ - public int getGender() { - return gender; + public int getExchangeTimes() { + return exchangeTimes; } /** - * optional uint32 gender = 14; - * @param value the gender to set + * optional uint32 exchange_times = 14; + * @param value the exchangeTimes to set * @return this */ - public GetBasicInfoScRsp setGender(final int value) { + public GetBasicInfoScRsp setExchangeTimes(final int value) { bitField0_ |= 0x00000080; - gender = value; + exchangeTimes = value; return this; } /** - * optional bool is_gender_set = 9; + * optional bool is_gender_set = 7; * @return whether the isGenderSet field is set */ public boolean hasIsGenderSet() { @@ -383,7 +383,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional bool is_gender_set = 9; + * optional bool is_gender_set = 7; * @return this */ public GetBasicInfoScRsp clearIsGenderSet() { @@ -393,7 +393,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional bool is_gender_set = 9; + * optional bool is_gender_set = 7; * @return the isGenderSet */ public boolean getIsGenderSet() { @@ -401,7 +401,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional bool is_gender_set = 9; + * optional bool is_gender_set = 7; * @param value the isGenderSet to set * @return this */ @@ -412,7 +412,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 4; + * optional .PlayerSettingInfo player_setting_info = 1; * @return whether the playerSettingInfo field is set */ public boolean hasPlayerSettingInfo() { @@ -420,7 +420,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 4; + * optional .PlayerSettingInfo player_setting_info = 1; * @return this */ public GetBasicInfoScRsp clearPlayerSettingInfo() { @@ -430,7 +430,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 4; + * optional .PlayerSettingInfo player_setting_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. @@ -444,7 +444,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 4; + * optional .PlayerSettingInfo player_setting_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 @@ -458,7 +458,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 4; + * optional .PlayerSettingInfo player_setting_info = 1; * @param value the playerSettingInfo to set * @return this */ @@ -476,12 +476,12 @@ public final class GetBasicInfoScRspOuterClass { bitField0_ = other.bitField0_; nextRecoverTime = other.nextRecoverTime; lastSetNicknameTime = other.lastSetNicknameTime; - curDay = other.curDay; gameplayBirthday = other.gameplayBirthday; - weekCocoonFinishedCount = other.weekCocoonFinishedCount; - exchangeTimes = other.exchangeTimes; - retcode = other.retcode; gender = other.gender; + weekCocoonFinishedCount = other.weekCocoonFinishedCount; + curDay = other.curDay; + retcode = other.retcode; + exchangeTimes = other.exchangeTimes; isGenderSet = other.isGenderSet; playerSettingInfo.copyFrom(other.playerSettingInfo); } @@ -500,23 +500,23 @@ public final class GetBasicInfoScRspOuterClass { if (other.hasLastSetNicknameTime()) { setLastSetNicknameTime(other.lastSetNicknameTime); } - if (other.hasCurDay()) { - setCurDay(other.curDay); - } if (other.hasGameplayBirthday()) { setGameplayBirthday(other.gameplayBirthday); } + if (other.hasGender()) { + setGender(other.gender); + } if (other.hasWeekCocoonFinishedCount()) { setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); } - if (other.hasExchangeTimes()) { - setExchangeTimes(other.exchangeTimes); + if (other.hasCurDay()) { + setCurDay(other.curDay); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasGender()) { - setGender(other.gender); + if (other.hasExchangeTimes()) { + setExchangeTimes(other.exchangeTimes); } if (other.hasIsGenderSet()) { setIsGenderSet(other.isGenderSet); @@ -536,12 +536,12 @@ public final class GetBasicInfoScRspOuterClass { bitField0_ = 0; nextRecoverTime = 0L; lastSetNicknameTime = 0L; - curDay = 0; gameplayBirthday = 0; - weekCocoonFinishedCount = 0; - exchangeTimes = 0; - retcode = 0; gender = 0; + weekCocoonFinishedCount = 0; + curDay = 0; + retcode = 0; + exchangeTimes = 0; isGenderSet = false; playerSettingInfo.clear(); return this; @@ -570,12 +570,12 @@ public final class GetBasicInfoScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) - && (!hasCurDay() || curDay == other.curDay) && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) - && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) - && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) - && (!hasRetcode() || retcode == other.retcode) && (!hasGender() || gender == other.gender) + && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) + && (!hasCurDay() || curDay == other.curDay) + && (!hasRetcode() || retcode == other.retcode) + && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) && (!hasIsGenderSet() || isGenderSet == other.isGenderSet) && (!hasPlayerSettingInfo() || playerSettingInfo.equals(other.playerSettingInfo)); } @@ -583,43 +583,43 @@ public final class GetBasicInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeInt64NoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(curDay); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); output.writeUInt32NoTag(gameplayBirthday); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(gender); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(exchangeTimes); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(curDay); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(gender); + output.writeUInt32NoTag(exchangeTimes); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeBoolNoTag(isGenderSet); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(playerSettingInfo); } } @@ -634,22 +634,22 @@ public final class GetBasicInfoScRspOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gender); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); } if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gender); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); } if ((bitField0_ & 0x00000100) != 0) { size += 2; @@ -667,16 +667,16 @@ public final class GetBasicInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // nextRecoverTime nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { + case 104: { // lastSetNicknameTime lastSetNicknameTime = input.readInt64(); bitField0_ |= 0x00000002; @@ -686,42 +686,42 @@ public final class GetBasicInfoScRspOuterClass { } } case 16: { - // curDay - curDay = input.readUInt32(); + // gameplayBirthday + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { - // gameplayBirthday - gameplayBirthday = input.readUInt32(); + case 32: { + // gender + gender = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // weekCocoonFinishedCount + weekCocoonFinishedCount = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // weekCocoonFinishedCount - weekCocoonFinishedCount = input.readUInt32(); - bitField0_ |= 0x00000010; + // curDay + curDay = input.readUInt32(); + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 88) { break; } } case 88: { - // exchangeTimes - exchangeTimes = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000040; @@ -731,24 +731,24 @@ public final class GetBasicInfoScRspOuterClass { } } case 112: { - // gender - gender = input.readUInt32(); + // exchangeTimes + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { + case 56: { // isGenderSet isGenderSet = input.readBool(); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // playerSettingInfo input.readMessage(playerSettingInfo); bitField0_ |= 0x00000200; @@ -781,22 +781,22 @@ public final class GetBasicInfoScRspOuterClass { output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curDay, curDay); + output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); + output.writeUInt32(FieldNames.gender, gender); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); + output.writeUInt32(FieldNames.curDay, curDay); } if ((bitField0_ & 0x00000040) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.gender, gender); + output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); } if ((bitField0_ & 0x00000100) != 0) { output.writeBool(FieldNames.isGenderSet, isGenderSet); @@ -838,11 +838,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case -1349164740: - case 1126372637: { - if (input.isAtField(FieldNames.curDay)) { + case 686542531: + case 172986486: { + if (input.isAtField(FieldNames.gameplayBirthday)) { if (!input.trySkipNullValue()) { - curDay = input.readUInt32(); + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -850,11 +850,10 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 686542531: - case 172986486: { - if (input.isAtField(FieldNames.gameplayBirthday)) { + case -1249512767: { + if (input.isAtField(FieldNames.gender)) { if (!input.trySkipNullValue()) { - gameplayBirthday = input.readUInt32(); + gender = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -874,11 +873,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 1371137763: - case -119434710: { - if (input.isAtField(FieldNames.exchangeTimes)) { + case -1349164740: + case 1126372637: { + if (input.isAtField(FieldNames.curDay)) { if (!input.trySkipNullValue()) { - exchangeTimes = input.readUInt32(); + curDay = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -897,10 +896,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case -1249512767: { - if (input.isAtField(FieldNames.gender)) { + case 1371137763: + case -119434710: { + if (input.isAtField(FieldNames.exchangeTimes)) { if (!input.trySkipNullValue()) { - gender = input.readUInt32(); + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000080; } } else { @@ -989,17 +989,17 @@ public final class GetBasicInfoScRspOuterClass { static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time"); - static final FieldName curDay = FieldName.forField("curDay", "cur_day"); - static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); + static final FieldName gender = FieldName.forField("gender"); + static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count"); - static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); + static final FieldName curDay = FieldName.forField("curDay", "cur_day"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gender = FieldName.forField("gender"); + static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); static final FieldName isGenderSet = FieldName.forField("isGenderSet", "is_gender_set"); diff --git a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java index 10d0822..5449609 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 = 14; + * optional uint32 retcode = 10; */ private int retcode; /** - * repeated .ChallengeReward challenge_reward_list = 4; - */ - private final RepeatedMessage challengeRewardList = RepeatedMessage.newEmptyInstance(ChallengeRewardOuterClass.ChallengeReward.getFactory()); - - /** - * repeated .Challenge challenge_list = 9; + * repeated .Challenge challenge_list = 1; */ private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory()); + /** + * repeated .ChallengeReward challenge_reward_list = 14; + */ + private final RepeatedMessage challengeRewardList = RepeatedMessage.newEmptyInstance(ChallengeRewardOuterClass.ChallengeReward.getFactory()); + private GetChallengeScRsp() { } @@ -45,7 +45,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 10; * @return this */ public GetChallengeScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -82,96 +82,25 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .ChallengeReward challenge_reward_list = 4; - * @return whether the challengeRewardList field is set + * repeated .Challenge challenge_list = 1; + * @return whether the challengeList field is set */ - public boolean hasChallengeRewardList() { + public boolean hasChallengeList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .ChallengeReward challenge_reward_list = 4; - * @return this - */ - public GetChallengeScRsp clearChallengeRewardList() { - bitField0_ &= ~0x00000002; - challengeRewardList.clear(); - return this; - } - - /** - * repeated .ChallengeReward challenge_reward_list = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableChallengeRewardList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getChallengeRewardList() { - return challengeRewardList; - } - - /** - * repeated .ChallengeReward challenge_reward_list = 4; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableChallengeRewardList( - ) { - bitField0_ |= 0x00000002; - return challengeRewardList; - } - - /** - * repeated .ChallengeReward challenge_reward_list = 4; - * @param value the challengeRewardList to add - * @return this - */ - public GetChallengeScRsp addChallengeRewardList( - final ChallengeRewardOuterClass.ChallengeReward value) { - bitField0_ |= 0x00000002; - challengeRewardList.add(value); - return this; - } - - /** - * repeated .ChallengeReward challenge_reward_list = 4; - * @param values the challengeRewardList to add - * @return this - */ - public GetChallengeScRsp addAllChallengeRewardList( - final ChallengeRewardOuterClass.ChallengeReward... values) { - bitField0_ |= 0x00000002; - challengeRewardList.addAll(values); - return this; - } - - /** - * repeated .Challenge challenge_list = 9; - * @return whether the challengeList field is set - */ - public boolean hasChallengeList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .Challenge challenge_list = 9; + * repeated .Challenge challenge_list = 1; * @return this */ public GetChallengeScRsp clearChallengeList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; challengeList.clear(); return this; } /** - * repeated .Challenge challenge_list = 9; + * repeated .Challenge challenge_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. @@ -185,7 +114,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .Challenge challenge_list = 9; + * repeated .Challenge challenge_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 @@ -194,40 +123,111 @@ public final class GetChallengeScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableChallengeList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return challengeList; } /** - * repeated .Challenge challenge_list = 9; + * repeated .Challenge challenge_list = 1; * @param value the challengeList to add * @return this */ public GetChallengeScRsp addChallengeList(final ChallengeOuterClass.Challenge value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; challengeList.add(value); return this; } /** - * repeated .Challenge challenge_list = 9; + * repeated .Challenge challenge_list = 1; * @param values the challengeList to add * @return this */ public GetChallengeScRsp addAllChallengeList(final ChallengeOuterClass.Challenge... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; challengeList.addAll(values); return this; } + /** + * repeated .ChallengeReward challenge_reward_list = 14; + * @return whether the challengeRewardList field is set + */ + public boolean hasChallengeRewardList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .ChallengeReward challenge_reward_list = 14; + * @return this + */ + public GetChallengeScRsp clearChallengeRewardList() { + bitField0_ &= ~0x00000004; + challengeRewardList.clear(); + return this; + } + + /** + * repeated .ChallengeReward challenge_reward_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 #getMutableChallengeRewardList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getChallengeRewardList() { + return challengeRewardList; + } + + /** + * repeated .ChallengeReward challenge_reward_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 getMutableChallengeRewardList( + ) { + bitField0_ |= 0x00000004; + return challengeRewardList; + } + + /** + * repeated .ChallengeReward challenge_reward_list = 14; + * @param value the challengeRewardList to add + * @return this + */ + public GetChallengeScRsp addChallengeRewardList( + final ChallengeRewardOuterClass.ChallengeReward value) { + bitField0_ |= 0x00000004; + challengeRewardList.add(value); + return this; + } + + /** + * repeated .ChallengeReward challenge_reward_list = 14; + * @param values the challengeRewardList to add + * @return this + */ + public GetChallengeScRsp addAllChallengeRewardList( + final ChallengeRewardOuterClass.ChallengeReward... values) { + bitField0_ |= 0x00000004; + challengeRewardList.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) 112); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < challengeRewardList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(challengeRewardList.get(i)); + for (int i = 0; i < challengeList.length(); i++) { + output.writeRawByte((byte) 10); + output.writeMessageNoTag(challengeList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < challengeList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(challengeList.get(i)); + for (int i = 0; i < challengeRewardList.length(); i++) { + output.writeRawByte((byte) 114); + 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,26 +332,26 @@ public final class GetChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { - // challengeRewardList - tag = input.readRepeatedMessage(challengeRewardList, tag); - bitField0_ |= 0x00000002; - if (tag != 74) { - break; - } - } - case 74: { + case 10: { // challengeList tag = input.readRepeatedMessage(challengeList, tag); + bitField0_ |= 0x00000002; + if (tag != 114) { + break; + } + } + case 114: { + // challengeRewardList + tag = input.readRepeatedMessage(challengeRewardList, 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 cb4c000..84142c6 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 = 9; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .ChallengeInfo challenge_info = 5; + * optional .ChallengeInfo challenge_info = 3; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @return this */ public GetCurChallengeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 5; + * optional .ChallengeInfo challenge_info = 3; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { @@ -84,7 +84,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 5; + * optional .ChallengeInfo challenge_info = 3; * @return this */ public GetCurChallengeScRsp clearChallengeInfo() { @@ -94,7 +94,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 5; + * optional .ChallengeInfo challenge_info = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 5; + * optional .ChallengeInfo challenge_info = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 5; + * optional .ChallengeInfo challenge_info = 3; * @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) 72); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 26); output.writeMessageNoTag(challengeInfo); } } @@ -227,16 +227,16 @@ public final class GetCurChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 26) { break; } } - case 42: { + case 26: { // 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 40df2ac..e98dc5c 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 = 8; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 15; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 10; * @return this */ public GetCurLineupDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 3; + * 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 = 3; + * optional .LineupInfo lineup = 15; * @return this */ public GetCurLineupDataScRsp clearLineup() { @@ -94,7 +94,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 3; + * 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 = 3; + * 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 = 3; + * 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) 64); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 122); output.writeMessageNoTag(lineup); } } @@ -226,16 +226,16 @@ public final class GetCurLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 122) { break; } } - case 26: { + 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 8e3465e..cb34103 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 = 5; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 11; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 15; * @return this */ public GetCurSceneInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 11; * @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 = 11; * @return this */ public GetCurSceneInfoScRsp clearScene() { @@ -94,7 +94,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 11; * @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) 40); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 90); output.writeMessageNoTag(scene); } } @@ -226,16 +226,16 @@ public final class GetCurSceneInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 90) { break; } } - case 26: { + case 90: { // 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 6871f2f..c45c71c 100644 --- a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java @@ -21,22 +21,22 @@ public final class GetDailyActiveInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 daily_active_point = 4; - */ - private int dailyActivePoint; - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated uint32 daily_active_quest_id_list = 10; + * optional uint32 daily_active_point = 9; + */ + private int dailyActivePoint; + + /** + * repeated uint32 daily_active_quest_id_list = 1; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 1; + * repeated .DailyActivityInfo daily_active_level_list = 8; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -51,62 +51,25 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 4; - * @return whether the dailyActivePoint field is set + * optional uint32 retcode = 6; + * @return whether the retcode field is set */ - public boolean hasDailyActivePoint() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 daily_active_point = 4; - * @return this - */ - public GetDailyActiveInfoScRsp clearDailyActivePoint() { - bitField0_ &= ~0x00000001; - dailyActivePoint = 0; - return this; - } - - /** - * optional uint32 daily_active_point = 4; - * @return the dailyActivePoint - */ - public int getDailyActivePoint() { - return dailyActivePoint; - } - - /** - * optional uint32 daily_active_point = 4; - * @param value the dailyActivePoint to set - * @return this - */ - public GetDailyActiveInfoScRsp setDailyActivePoint(final int value) { - bitField0_ |= 0x00000001; - dailyActivePoint = value; - return this; - } - - /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @return this */ public GetDailyActiveInfoScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -114,18 +77,55 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ public GetDailyActiveInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * repeated uint32 daily_active_quest_id_list = 10; + * optional uint32 daily_active_point = 9; + * @return whether the dailyActivePoint field is set + */ + public boolean hasDailyActivePoint() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 daily_active_point = 9; + * @return this + */ + public GetDailyActiveInfoScRsp clearDailyActivePoint() { + bitField0_ &= ~0x00000002; + dailyActivePoint = 0; + return this; + } + + /** + * optional uint32 daily_active_point = 9; + * @return the dailyActivePoint + */ + public int getDailyActivePoint() { + return dailyActivePoint; + } + + /** + * optional uint32 daily_active_point = 9; + * @param value the dailyActivePoint to set + * @return this + */ + public GetDailyActiveInfoScRsp setDailyActivePoint(final int value) { + bitField0_ |= 0x00000002; + dailyActivePoint = value; + return this; + } + + /** + * repeated uint32 daily_active_quest_id_list = 1; * @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 = 10; + * repeated uint32 daily_active_quest_id_list = 1; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveQuestIdList() { @@ -143,7 +143,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 10; + * repeated uint32 daily_active_quest_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. @@ -157,7 +157,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 10; + * repeated uint32 daily_active_quest_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 @@ -171,7 +171,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 10; + * repeated uint32 daily_active_quest_id_list = 1; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -182,7 +182,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 10; + * repeated uint32 daily_active_quest_id_list = 1; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -193,7 +193,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 1; + * repeated .DailyActivityInfo daily_active_level_list = 8; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -201,7 +201,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 1; + * repeated .DailyActivityInfo daily_active_level_list = 8; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveLevelList() { @@ -211,7 +211,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 1; + * 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. @@ -226,7 +226,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 1; + * 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 @@ -241,7 +241,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 1; + * repeated .DailyActivityInfo daily_active_level_list = 8; * @param value the dailyActiveLevelList to add * @return this */ @@ -253,7 +253,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 1; + * repeated .DailyActivityInfo daily_active_level_list = 8; * @param values the dailyActiveLevelList to add * @return this */ @@ -269,8 +269,8 @@ public final class GetDailyActiveInfoScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dailyActivePoint = other.dailyActivePoint; retcode = other.retcode; + dailyActivePoint = other.dailyActivePoint; dailyActiveQuestIdList.copyFrom(other.dailyActiveQuestIdList); dailyActiveLevelList.copyFrom(other.dailyActiveLevelList); } @@ -283,12 +283,12 @@ public final class GetDailyActiveInfoScRspOuterClass { return this; } cachedSize = -1; - if (other.hasDailyActivePoint()) { - setDailyActivePoint(other.dailyActivePoint); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasDailyActivePoint()) { + setDailyActivePoint(other.dailyActivePoint); + } if (other.hasDailyActiveQuestIdList()) { getMutableDailyActiveQuestIdList().addAll(other.dailyActiveQuestIdList); } @@ -305,8 +305,8 @@ public final class GetDailyActiveInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - dailyActivePoint = 0; retcode = 0; + dailyActivePoint = 0; dailyActiveQuestIdList.clear(); dailyActiveLevelList.clear(); return this; @@ -334,8 +334,8 @@ public final class GetDailyActiveInfoScRspOuterClass { } GetDailyActiveInfoScRsp other = (GetDailyActiveInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint) && (!hasRetcode() || retcode == other.retcode) + && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint) && (!hasDailyActiveQuestIdList() || dailyActiveQuestIdList.equals(other.dailyActiveQuestIdList)) && (!hasDailyActiveLevelList() || dailyActiveLevelList.equals(other.dailyActiveLevelList)); } @@ -343,22 +343,22 @@ public final class GetDailyActiveInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(dailyActivePoint); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 66); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -368,10 +368,10 @@ public final class GetDailyActiveInfoScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * dailyActiveQuestIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dailyActiveQuestIdList); @@ -389,34 +389,34 @@ public final class GetDailyActiveInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // dailyActivePoint - dailyActivePoint = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 48: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 72) { break; } } - case 82: { - // dailyActiveQuestIdList [packed=true] - input.readPackedUInt32(dailyActiveQuestIdList, tag); - bitField0_ |= 0x00000004; + case 72: { + // dailyActivePoint + dailyActivePoint = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 10) { break; } } case 10: { + // dailyActiveQuestIdList [packed=true] + input.readPackedUInt32(dailyActiveQuestIdList, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000008; @@ -434,7 +434,7 @@ public final class GetDailyActiveInfoScRspOuterClass { tag = input.readTag(); break; } - case 80: { + case 8: { // dailyActiveQuestIdList [packed=false] tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000004; @@ -448,10 +448,10 @@ public final class GetDailyActiveInfoScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.dailyActiveQuestIdList, dailyActiveQuestIdList); @@ -469,11 +469,10 @@ public final class GetDailyActiveInfoScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 859671121: - case 1952864125: { - if (input.isAtField(FieldNames.dailyActivePoint)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - dailyActivePoint = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -481,10 +480,11 @@ public final class GetDailyActiveInfoScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 859671121: + case 1952864125: { + if (input.isAtField(FieldNames.dailyActivePoint)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -569,10 +569,10 @@ public final class GetDailyActiveInfoScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point"); + static final FieldName dailyActiveQuestIdList = FieldName.forField("dailyActiveQuestIdList", "daily_active_quest_id_list"); static final FieldName dailyActiveLevelList = FieldName.forField("dailyActiveLevelList", "daily_active_level_list"); diff --git a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java index 24f1499..14c6f4c 100644 --- a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java @@ -20,7 +20,7 @@ public final class GetEnteredSceneScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; */ private int retcode; @@ -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 */ @@ -213,7 +213,7 @@ 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) { @@ -243,7 +243,7 @@ public final class GetEnteredSceneScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java index 84eea45..7cd297e 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 = 5; + * repeated uint32 farm_stage_gacha_id_list = 6; */ private final RepeatedInt farmStageGachaIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 5; + * repeated uint32 farm_stage_gacha_id_list = 6; * @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 = 5; + * repeated uint32 farm_stage_gacha_id_list = 6; * @return this */ public GetFarmStageGachaInfoCsReq clearFarmStageGachaIdList() { @@ -53,7 +53,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 5; + * repeated uint32 farm_stage_gacha_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 GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 5; + * repeated uint32 farm_stage_gacha_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 GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 5; + * repeated uint32 farm_stage_gacha_id_list = 6; * @param value the farmStageGachaIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 5; + * repeated uint32 farm_stage_gacha_id_list = 6; * @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) 40); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(farmStageGachaIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 50: { // farmStageGachaIdList [packed=true] input.readPackedUInt32(farmStageGachaIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { tag = input.readTag(); break; } - case 40: { + case 48: { // 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 5e9a62e..cac1515 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 = 4; + * optional uint32 retcode = 15; */ private int retcode; /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 8; */ private final RepeatedMessage farmStageGachaInfoList = RepeatedMessage.newEmptyInstance(FarmStageGachaInfoOuterClass.FarmStageGachaInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * 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 GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @return this */ public GetFarmStageGachaInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 8; * @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 = 5; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 8; * @return this */ public GetFarmStageGachaInfoScRsp clearFarmStageGachaInfoList() { @@ -95,7 +95,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; + * repeated .FarmStageGachaInfo farm_stage_gacha_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. @@ -110,7 +110,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; + * repeated .FarmStageGachaInfo farm_stage_gacha_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 @@ -125,7 +125,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 8; * @param value the farmStageGachaInfoList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 8; * @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) 32); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < farmStageGachaInfoList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 66); output.writeMessageNoTag(farmStageGachaInfoList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFarmStageGachaInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 66) { break; } } - case 42: { + case 66: { // 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 5340f10..e368eab 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 = 2; + * repeated uint32 npc_talk_list = 4; */ private final RepeatedInt npcTalkList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 4; * @return whether the npcTalkList field is set */ public boolean hasNpcTalkList() { @@ -43,7 +43,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 4; * @return this */ public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() { @@ -53,7 +53,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_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 GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_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 GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 4; * @param value the npcTalkList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 2; + * repeated uint32 npc_talk_list = 4; * @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) 16); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(npcTalkList.array()[i]); } } @@ -187,7 +187,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 34: { // npcTalkList [packed=true] input.readPackedUInt32(npcTalkList, tag); bitField0_ |= 0x00000001; @@ -206,7 +206,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { tag = input.readTag(); break; } - case 16: { + case 32: { // 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 16380ac..8c0c26c 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java @@ -20,7 +20,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; */ private int retcode; @@ -40,7 +40,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -214,7 +214,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -244,7 +244,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java index d0ad2f9..c9c731d 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 = 13; + * repeated uint32 npc_id_list = 14; */ private final RepeatedInt npcIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 13; + * repeated uint32 npc_id_list = 14; * @return whether the npcIdList field is set */ public boolean hasNpcIdList() { @@ -43,7 +43,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 13; + * repeated uint32 npc_id_list = 14; * @return this */ public GetFirstTalkNpcCsReq clearNpcIdList() { @@ -53,7 +53,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 13; + * repeated uint32 npc_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 GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 13; + * repeated uint32 npc_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 GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 13; + * repeated uint32 npc_id_list = 14; * @param value the npcIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 13; + * repeated uint32 npc_id_list = 14; * @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) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(npcIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 114: { // npcIdList [packed=true] input.readPackedUInt32(npcIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { tag = input.readTag(); break; } - case 104: { + case 112: { // 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 586dc13..1bdc176 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 = 3; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; */ private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(FirstNpcTalkInfoOuterClass.FirstNpcTalkInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return this */ public GetFirstTalkNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; * @return whether the npcTalkInfoList field is set */ public boolean hasNpcTalkInfoList() { @@ -85,7 +85,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; * @return this */ public GetFirstTalkNpcScRsp clearNpcTalkInfoList() { @@ -95,7 +95,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; + * repeated .FirstNpcTalkInfo npc_talk_info_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 GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; + * repeated .FirstNpcTalkInfo npc_talk_info_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 @@ -124,7 +124,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; * @param value the npcTalkInfoList to add * @return this */ @@ -136,7 +136,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; * @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) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < npcTalkInfoList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 26); output.writeMessageNoTag(npcTalkInfoList.get(i)); } } @@ -243,16 +243,16 @@ public final class GetFirstTalkNpcScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 26) { break; } } - case 114: { + case 26: { // 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 f6eda8d..bba13c3 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFriendApplyListInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated .FriendApplyInfo friend_apply_list = 11; + * repeated .FriendApplyInfo friend_apply_list = 10; */ private final RepeatedMessage friendApplyList = RepeatedMessage.newEmptyInstance(FriendApplyInfoOuterClass.FriendApplyInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * 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 GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return this */ public GetFriendApplyListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 11; + * repeated .FriendApplyInfo friend_apply_list = 10; * @return whether the friendApplyList field is set */ public boolean hasFriendApplyList() { @@ -85,7 +85,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 11; + * repeated .FriendApplyInfo friend_apply_list = 10; * @return this */ public GetFriendApplyListInfoScRsp clearFriendApplyList() { @@ -95,7 +95,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 11; + * repeated .FriendApplyInfo friend_apply_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 GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 11; + * repeated .FriendApplyInfo friend_apply_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 GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 11; + * repeated .FriendApplyInfo friend_apply_list = 10; * @param value the friendApplyList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 11; + * repeated .FriendApplyInfo friend_apply_list = 10; * @param values the friendApplyList to add * @return this */ @@ -212,12 +212,12 @@ public final class GetFriendApplyListInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendApplyList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 82); output.writeMessageNoTag(friendApplyList.get(i)); } } @@ -242,16 +242,16 @@ public final class GetFriendApplyListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 82) { break; } } - case 90: { + case 82: { // 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 3cece96..4af9979 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 = 11; + * optional uint32 retcode = 10; */ private int retcode; /** - * repeated .FriendListInfo friend_list = 6; + * repeated .FriendListInfo friend_list = 3; */ private final RepeatedMessage friendList = RepeatedMessage.newEmptyInstance(FriendListInfoOuterClass.FriendListInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 10; * @return this */ public GetFriendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 6; + * repeated .FriendListInfo friend_list = 3; * @return whether the friendList field is set */ public boolean hasFriendList() { @@ -85,7 +85,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 6; + * repeated .FriendListInfo friend_list = 3; * @return this */ public GetFriendListInfoScRsp clearFriendList() { @@ -95,7 +95,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 6; + * repeated .FriendListInfo friend_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 GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 6; + * repeated .FriendListInfo friend_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 GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 6; + * repeated .FriendListInfo friend_list = 3; * @param value the friendList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 6; + * repeated .FriendListInfo friend_list = 3; * @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) 88); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 26); output.writeMessageNoTag(friendList.get(i)); } } @@ -242,16 +242,16 @@ public final class GetFriendListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 26) { break; } } - case 50: { + case 26: { // 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 83a7387..7146753 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java @@ -20,12 +20,16 @@ public final class GetFriendLoginInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; */ private int retcode; /** - * repeated uint32 friend_uid_list = 11; + * 
+     *  could be 9, TODO: check
+     *
+ * + * repeated uint32 friend_uid_list = 7; */ private final RepeatedInt friendUidList = RepeatedInt.newEmptyInstance(); @@ -40,7 +44,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +52,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return this */ public GetFriendLoginInfoScRsp clearRetcode() { @@ -58,7 +62,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -66,7 +70,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -77,7 +81,11 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * 
+     *  could be 9, TODO: check
+     *
+ * + * repeated uint32 friend_uid_list = 7; * @return whether the friendUidList field is set */ public boolean hasFriendUidList() { @@ -85,7 +93,11 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * 
+     *  could be 9, TODO: check
+     *
+ * + * repeated uint32 friend_uid_list = 7; * @return this */ public GetFriendLoginInfoScRsp clearFriendUidList() { @@ -95,7 +107,11 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * 
+     *  could be 9, TODO: check
+     *
+ * + * repeated uint32 friend_uid_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +125,11 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * 
+     *  could be 9, TODO: check
+     *
+ * + * repeated uint32 friend_uid_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +143,11 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * 
+     *  could be 9, TODO: check
+     *
+ * + * repeated uint32 friend_uid_list = 7; * @param value the friendUidList to add * @return this */ @@ -134,7 +158,11 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * 
+     *  could be 9, TODO: check
+     *
+ * + * repeated uint32 friend_uid_list = 7; * @param values the friendUidList to add * @return this */ @@ -210,12 +238,12 @@ public final class GetFriendLoginInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendUidList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(friendUidList.array()[i]); } } @@ -240,16 +268,16 @@ public final class GetFriendLoginInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 58) { break; } } - case 90: { + case 58: { // friendUidList [packed=true] input.readPackedUInt32(friendUidList, tag); bitField0_ |= 0x00000002; @@ -268,7 +296,7 @@ public final class GetFriendLoginInfoScRspOuterClass { tag = input.readTag(); break; } - case 88: { + case 56: { // friendUidList [packed=false] tag = input.readRepeatedUInt32(friendUidList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java index d56e7a1..b07a409 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 = 5; + * optional uint32 retcode = 7; */ private int retcode; /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 12; */ private final RepeatedMessage friendRecommendList = RepeatedMessage.newEmptyInstance(FriendRecommendInfoOuterClass.FriendRecommendInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return this */ public GetFriendRecommendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 12; * @return whether the friendRecommendList field is set */ public boolean hasFriendRecommendList() { @@ -85,7 +85,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 12; * @return this */ public GetFriendRecommendListInfoScRsp clearFriendRecommendList() { @@ -95,7 +95,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_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. @@ -110,7 +110,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_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 @@ -125,7 +125,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 12; * @param value the friendRecommendList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 13; + * repeated .FriendRecommendInfo friend_recommend_list = 12; * @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) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendRecommendList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 98); output.writeMessageNoTag(friendRecommendList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFriendRecommendListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 98) { break; } } - case 106: { + case 98: { // 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 de05ce3..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 = 15; + * optional uint32 gacha_type = 7; */ private int gachaType; @@ -34,7 +34,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 15; + * 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 = 15; + * optional uint32 gacha_type = 7; * @return this */ public GetGachaCeilingCsReq clearGachaType() { @@ -52,7 +52,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 7; * @return the gachaType */ public int getGachaType() { @@ -60,7 +60,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 15; + * 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) 120); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(gachaType); } } @@ -150,7 +150,7 @@ public final class GetGachaCeilingCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + 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 e19995d..bf35951 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 gacha_type = 14; + * optional uint32 gacha_type = 3; */ private int gachaType; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .GachaCeiling gacha_ceiling = 11; + * optional .GachaCeiling gacha_ceiling = 4; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); @@ -44,7 +44,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 3; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -52,7 +52,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 3; * @return this */ public GetGachaCeilingScRsp clearGachaType() { @@ -62,7 +62,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 3; * @return the gachaType */ public int getGachaType() { @@ -70,7 +70,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 14; + * optional uint32 gacha_type = 3; * @param value the gachaType to set * @return this */ @@ -81,7 +81,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return this */ public GetGachaCeilingScRsp clearRetcode() { @@ -99,7 +99,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 11; + * optional .GachaCeiling gacha_ceiling = 4; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -126,7 +126,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 11; + * optional .GachaCeiling gacha_ceiling = 4; * @return this */ public GetGachaCeilingScRsp clearGachaCeiling() { @@ -136,7 +136,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 11; + * optional .GachaCeiling gacha_ceiling = 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 GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 11; + * optional .GachaCeiling gacha_ceiling = 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 GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 11; + * optional .GachaCeiling gacha_ceiling = 4; * @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) 112); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 34); output.writeMessageNoTag(gachaCeiling); } } @@ -281,25 +281,25 @@ public final class GetGachaCeilingScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 24: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 34) { break; } } - case 90: { + case 34: { // 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 035a6b4..946a4da 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetGachaInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 14; - */ - private int retcode; - - /** - * optional uint32 gacha_random = 15; + * optional uint32 gacha_random = 2; */ private int gachaRandom; /** - * repeated .GachaInfo gacha_info_list = 12; + * optional uint32 retcode = 7; + */ + private int retcode; + + /** + * repeated .GachaInfo gacha_info_list = 3; */ private final RepeatedMessage gachaInfoList = RepeatedMessage.newEmptyInstance(GachaInfoOuterClass.GachaInfo.getFactory()); @@ -45,62 +45,25 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set + * optional uint32 gacha_random = 2; + * @return whether the gachaRandom field is set */ - public boolean hasRetcode() { + public boolean hasGachaRandom() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 14; - * @return this - */ - public GetGachaInfoScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 14; - * @param value the retcode to set - * @return this - */ - public GetGachaInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 gacha_random = 15; - * @return whether the gachaRandom field is set - */ - public boolean hasGachaRandom() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 gacha_random = 15; + * optional uint32 gacha_random = 2; * @return this */ public GetGachaInfoScRsp clearGachaRandom() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; gachaRandom = 0; return this; } /** - * optional uint32 gacha_random = 15; + * optional uint32 gacha_random = 2; * @return the gachaRandom */ public int getGachaRandom() { @@ -108,18 +71,55 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 15; + * optional uint32 gacha_random = 2; * @param value the gachaRandom to set * @return this */ public GetGachaInfoScRsp setGachaRandom(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; gachaRandom = value; return this; } /** - * repeated .GachaInfo gacha_info_list = 12; + * optional uint32 retcode = 7; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 7; + * @return this + */ + public GetGachaInfoScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + 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 GetGachaInfoScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * repeated .GachaInfo gacha_info_list = 3; * @return whether the gachaInfoList field is set */ public boolean hasGachaInfoList() { @@ -127,7 +127,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 12; + * repeated .GachaInfo gacha_info_list = 3; * @return this */ public GetGachaInfoScRsp clearGachaInfoList() { @@ -137,7 +137,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 12; + * repeated .GachaInfo gacha_info_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 12; + * repeated .GachaInfo gacha_info_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 12; + * repeated .GachaInfo gacha_info_list = 3; * @param value the gachaInfoList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 12; + * repeated .GachaInfo gacha_info_list = 3; * @param values the gachaInfoList to add * @return this */ @@ -191,8 +191,8 @@ public final class GetGachaInfoScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; gachaRandom = other.gachaRandom; + retcode = other.retcode; gachaInfoList.copyFrom(other.gachaInfoList); } return this; @@ -204,12 +204,12 @@ public final class GetGachaInfoScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasGachaRandom()) { setGachaRandom(other.gachaRandom); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasGachaInfoList()) { getMutableGachaInfoList().addAll(other.gachaInfoList); } @@ -223,8 +223,8 @@ public final class GetGachaInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; gachaRandom = 0; + retcode = 0; gachaInfoList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetGachaInfoScRspOuterClass { } GetGachaInfoScRsp other = (GetGachaInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasGachaRandom() || gachaRandom == other.gachaRandom) + && (!hasRetcode() || retcode == other.retcode) && (!hasGachaInfoList() || gachaInfoList.equals(other.gachaInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(gachaRandom); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < gachaInfoList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 26); output.writeMessageNoTag(gachaInfoList.get(i)); } } @@ -277,10 +277,10 @@ public final class GetGachaInfoScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * gachaInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaInfoList); @@ -295,25 +295,25 @@ public final class GetGachaInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 16: { // gachaRandom gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 56) { break; } } - case 98: { + case 56: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 26) { + break; + } + } + case 26: { // gachaInfoList tag = input.readRepeatedMessage(gachaInfoList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class GetGachaInfoScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.gachaRandom, gachaRandom); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.gachaInfoList, gachaInfoList); @@ -357,10 +357,11 @@ public final class GetGachaInfoScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1635961627: + case -47579616: { + if (input.isAtField(FieldNames.gachaRandom)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -368,11 +369,10 @@ public final class GetGachaInfoScRspOuterClass { } break; } - case -1635961627: - case -47579616: { - if (input.isAtField(FieldNames.gachaRandom)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - gachaRandom = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetGachaInfoScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName gachaInfoList = FieldName.forField("gachaInfoList", "gacha_info_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java index f548d5e..b58d26f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java @@ -20,7 +20,7 @@ public final class GetJukeboxDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; */ private int retcode; @@ -30,7 +30,7 @@ public final class GetJukeboxDataScRspOuterClass { private int playingId; /** - * repeated .UnlockedMusic music_list = 7; + * repeated .UnlockedMusic music_list = 1; */ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory()); @@ -45,7 +45,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return this */ public GetJukeboxDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 7; + * repeated .UnlockedMusic music_list = 1; * @return whether the musicList field is set */ public boolean hasMusicList() { @@ -127,7 +127,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 7; + * repeated .UnlockedMusic music_list = 1; * @return this */ public GetJukeboxDataScRsp clearMusicList() { @@ -137,7 +137,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 7; + * repeated .UnlockedMusic music_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 GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 7; + * repeated .UnlockedMusic music_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 GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 7; + * repeated .UnlockedMusic music_list = 1; * @param value the musicList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 7; + * repeated .UnlockedMusic music_list = 1; * @param values the musicList to add * @return this */ @@ -259,7 +259,7 @@ public final class GetJukeboxDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -268,7 +268,7 @@ public final class GetJukeboxDataScRspOuterClass { } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < musicList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 10); output.writeMessageNoTag(musicList.get(i)); } } @@ -296,7 +296,7 @@ public final class GetJukeboxDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -310,11 +310,11 @@ public final class GetJukeboxDataScRspOuterClass { playingId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { + case 10: { // 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 cddb838..b1125b7 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 = 2; - */ - private int retcode; - - /** - * optional uint32 total_num = 7; - */ - private int totalNum; - - /** - * optional uint32 start = 11; + * optional uint32 start = 1; */ private int start; /** - * optional bool is_end = 13; + * optional uint32 total_num = 10; + */ + private int totalNum; + + /** + * optional uint32 retcode = 14; + */ + private int retcode; + + /** + * optional bool is_end = 8; */ private boolean isEnd; /** - * repeated .ClientMail notice_mail_list = 9; - */ - private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); - - /** - * repeated .ClientMail mail_list = 12; + * repeated .ClientMail mail_list = 2; */ private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); + /** + * repeated .ClientMail notice_mail_list = 4; + */ + private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); + private GetMailScRsp() { } @@ -60,44 +60,44 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 2; - * @return whether the retcode field is set + * optional uint32 start = 1; + * @return whether the start field is set */ - public boolean hasRetcode() { + public boolean hasStart() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 2; + * optional uint32 start = 1; * @return this */ - public GetMailScRsp clearRetcode() { + public GetMailScRsp clearStart() { bitField0_ &= ~0x00000001; - retcode = 0; + start = 0; return this; } /** - * optional uint32 retcode = 2; - * @return the retcode + * optional uint32 start = 1; + * @return the start */ - public int getRetcode() { - return retcode; + public int getStart() { + return start; } /** - * optional uint32 retcode = 2; - * @param value the retcode to set + * optional uint32 start = 1; + * @param value the start to set * @return this */ - public GetMailScRsp setRetcode(final int value) { + public GetMailScRsp setStart(final int value) { bitField0_ |= 0x00000001; - retcode = value; + start = value; return this; } /** - * optional uint32 total_num = 7; + * optional uint32 total_num = 10; * @return whether the totalNum field is set */ public boolean hasTotalNum() { @@ -105,7 +105,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 7; + * optional uint32 total_num = 10; * @return this */ public GetMailScRsp clearTotalNum() { @@ -115,7 +115,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 7; + * optional uint32 total_num = 10; * @return the totalNum */ public int getTotalNum() { @@ -123,7 +123,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 7; + * optional uint32 total_num = 10; * @param value the totalNum to set * @return this */ @@ -134,44 +134,44 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 start = 11; - * @return whether the start field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasStart() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 start = 11; + * optional uint32 retcode = 14; * @return this */ - public GetMailScRsp clearStart() { + public GetMailScRsp clearRetcode() { bitField0_ &= ~0x00000004; - start = 0; + retcode = 0; return this; } /** - * optional uint32 start = 11; - * @return the start + * optional uint32 retcode = 14; + * @return the retcode */ - public int getStart() { - return start; + public int getRetcode() { + return retcode; } /** - * optional uint32 start = 11; - * @param value the start to set + * optional uint32 retcode = 14; + * @param value the retcode to set * @return this */ - public GetMailScRsp setStart(final int value) { + public GetMailScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - start = value; + retcode = value; return this; } /** - * optional bool is_end = 13; + * optional bool is_end = 8; * @return whether the isEnd field is set */ public boolean hasIsEnd() { @@ -179,7 +179,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 13; + * optional bool is_end = 8; * @return this */ public GetMailScRsp clearIsEnd() { @@ -189,7 +189,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 13; + * optional bool is_end = 8; * @return the isEnd */ public boolean getIsEnd() { @@ -197,7 +197,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 13; + * optional bool is_end = 8; * @param value the isEnd to set * @return this */ @@ -208,93 +208,25 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 9; - * @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 = 9; - * @return this - */ - public GetMailScRsp clearNoticeMailList() { - bitField0_ &= ~0x00000010; - noticeMailList.clear(); - return this; - } - - /** - * repeated .ClientMail notice_mail_list = 9; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * 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 = 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 getMutableNoticeMailList() { - bitField0_ |= 0x00000010; - return noticeMailList; - } - - /** - * repeated .ClientMail notice_mail_list = 9; - * @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 = 9; - * @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 = 12; - * @return whether the mailList field is set - */ - public boolean hasMailList() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * repeated .ClientMail mail_list = 12; + * repeated .ClientMail mail_list = 2; * @return this */ public GetMailScRsp clearMailList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; mailList.clear(); return this; } /** - * repeated .ClientMail mail_list = 12; + * 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 = 12; + * 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,43 +249,111 @@ public final class GetMailScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMailList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return mailList; } /** - * repeated .ClientMail mail_list = 12; + * 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 = 12; + * 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 = 4; + * @return whether the noticeMailList field is set + */ + public boolean hasNoticeMailList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .ClientMail notice_mail_list = 4; + * @return this + */ + public GetMailScRsp clearNoticeMailList() { + bitField0_ &= ~0x00000020; + noticeMailList.clear(); + return this; + } + + /** + * repeated .ClientMail notice_mail_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 #getMutableNoticeMailList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getNoticeMailList() { + return noticeMailList; + } + + /** + * repeated .ClientMail notice_mail_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 getMutableNoticeMailList() { + bitField0_ |= 0x00000020; + return noticeMailList; + } + + /** + * repeated .ClientMail notice_mail_list = 4; + * @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 = 4; + * @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; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; - totalNum = other.totalNum; start = other.start; + totalNum = other.totalNum; + retcode = other.retcode; isEnd = other.isEnd; - noticeMailList.copyFrom(other.noticeMailList); mailList.copyFrom(other.mailList); + noticeMailList.copyFrom(other.noticeMailList); } return this; } @@ -364,24 +364,24 @@ public final class GetMailScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasStart()) { + setStart(other.start); } if (other.hasTotalNum()) { setTotalNum(other.totalNum); } - if (other.hasStart()) { - setStart(other.start); + if (other.hasRetcode()) { + setRetcode(other.retcode); } 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; } @@ -392,12 +392,12 @@ public final class GetMailScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; - totalNum = 0; start = 0; + totalNum = 0; + retcode = 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; } @@ -423,42 +423,42 @@ public final class GetMailScRspOuterClass { } GetMailScRsp other = (GetMailScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasTotalNum() || totalNum == other.totalNum) && (!hasStart() || start == other.start) + && (!hasTotalNum() || totalNum == other.totalNum) + && (!hasRetcode() || retcode == other.retcode) && (!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) 16); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(start); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(totalNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(start); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeBoolNoTag(isEnd); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < noticeMailList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(noticeMailList.get(i)); + for (int i = 0; i < mailList.length(); i++) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(mailList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < mailList.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(mailList.get(i)); + for (int i = 0; i < noticeMailList.length(); i++) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(noticeMailList.get(i)); } } } @@ -467,22 +467,22 @@ public final class GetMailScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(start); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(totalNum); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(start); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { 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,53 +494,53 @@ public final class GetMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // retcode - retcode = input.readUInt32(); + case 8: { + // start + start = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 80) { break; } } - case 56: { + case 80: { // totalNum totalNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 112) { break; } } - case 88: { - // start - start = input.readUInt32(); + case 112: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 64) { break; } } - case 104: { + case 64: { // isEnd isEnd = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 74) { + if (tag != 18) { break; } } - case 74: { - // noticeMailList - tag = input.readRepeatedMessage(noticeMailList, tag); - bitField0_ |= 0x00000010; - if (tag != 98) { - break; - } - } - case 98: { + case 18: { // mailList tag = input.readRepeatedMessage(mailList, tag); + bitField0_ |= 0x00000010; + if (tag != 34) { + break; + } + } + case 34: { + // noticeMailList + tag = input.readRepeatedMessage(noticeMailList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -564,22 +564,22 @@ public final class GetMailScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.start, start); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.totalNum, totalNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.start, start); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { 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(); } @@ -591,10 +591,10 @@ public final class GetMailScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 109757538: { + if (input.isAtField(FieldNames.start)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + start = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -614,10 +614,10 @@ public final class GetMailScRspOuterClass { } break; } - case 109757538: { - if (input.isAtField(FieldNames.start)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - start = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -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 { @@ -713,17 +713,17 @@ public final class GetMailScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName start = FieldName.forField("start"); static final FieldName totalNum = FieldName.forField("totalNum", "total_num"); - static final FieldName start = FieldName.forField("start"); + static final FieldName retcode = FieldName.forField("retcode"); 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 d842138..a77165f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class GetMissionStatusCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 main_mission_id_list = 6; + * repeated uint32 main_mission_id_list = 8; */ private final RepeatedInt mainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 10; */ private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 6; + * repeated uint32 main_mission_id_list = 8; * @return whether the mainMissionIdList field is set */ public boolean hasMainMissionIdList() { @@ -53,7 +53,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 6; + * repeated uint32 main_mission_id_list = 8; * @return this */ public GetMissionStatusCsReq clearMainMissionIdList() { @@ -63,7 +63,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 6; + * repeated uint32 main_mission_id_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -77,7 +77,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 6; + * repeated uint32 main_mission_id_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -91,7 +91,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 6; + * repeated uint32 main_mission_id_list = 8; * @param value the mainMissionIdList to add * @return this */ @@ -102,7 +102,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 6; + * repeated uint32 main_mission_id_list = 8; * @param values the mainMissionIdList to add * @return this */ @@ -113,7 +113,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 10; * @return whether the subMissionIdList field is set */ public boolean hasSubMissionIdList() { @@ -121,7 +121,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 10; * @return this */ public GetMissionStatusCsReq clearSubMissionIdList() { @@ -131,7 +131,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_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. @@ -145,7 +145,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_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 @@ -159,7 +159,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 10; * @param value the subMissionIdList to add * @return this */ @@ -170,7 +170,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 10; * @param values the subMissionIdList to add * @return this */ @@ -323,13 +323,13 @@ public final class GetMissionStatusCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < mainMissionIdList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(mainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < subMissionIdList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(subMissionIdList.array()[i]); } } @@ -363,16 +363,16 @@ public final class GetMissionStatusCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 66: { // mainMissionIdList [packed=true] input.readPackedUInt32(mainMissionIdList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + case 82: { // subMissionIdList [packed=true] input.readPackedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000002; @@ -400,13 +400,13 @@ public final class GetMissionStatusCsReqOuterClass { tag = input.readTag(); break; } - case 48: { + case 64: { // mainMissionIdList [packed=false] tag = input.readRepeatedUInt32(mainMissionIdList, tag); bitField0_ |= 0x00000001; break; } - case 64: { + case 80: { // subMissionIdList [packed=false] tag = input.readRepeatedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java index 5720176..2c03101 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 = 11; + * optional uint32 retcode = 10; */ private int retcode; + /** + * repeated uint32 unfinished_main_mission_id_list = 1; + */ + private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance(); + /** * repeated uint32 finished_main_mission_id_list = 6; */ private final RepeatedInt finishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 disabled_main_mission_id_list = 8; + * repeated uint32 disabled_main_mission_id_list = 13; */ private final RepeatedInt disabledMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 unfinished_main_mission_id_list = 12; - */ - private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated .Mission mission_event_status_list = 4; - */ - private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); - - /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 8; */ private final RepeatedMessage subMissionStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + /** + * repeated .Mission mission_event_status_list = 9; + */ + private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private GetMissionStatusScRsp() { } @@ -61,7 +61,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -69,7 +69,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 10; * @return this */ public GetMissionStatusScRsp clearRetcode() { @@ -79,7 +79,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -87,7 +87,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -97,12 +97,80 @@ public final class GetMissionStatusScRspOuterClass { return this; } + /** + * repeated uint32 unfinished_main_mission_id_list = 1; + * @return whether the unfinishedMainMissionIdList field is set + */ + public boolean hasUnfinishedMainMissionIdList() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * repeated uint32 unfinished_main_mission_id_list = 1; + * @return this + */ + public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { + bitField0_ &= ~0x00000002; + unfinishedMainMissionIdList.clear(); + return this; + } + + /** + * repeated uint32 unfinished_main_mission_id_list = 1; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableUnfinishedMainMissionIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getUnfinishedMainMissionIdList() { + return unfinishedMainMissionIdList; + } + + /** + * repeated uint32 unfinished_main_mission_id_list = 1; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableUnfinishedMainMissionIdList() { + bitField0_ |= 0x00000002; + return unfinishedMainMissionIdList; + } + + /** + * repeated uint32 unfinished_main_mission_id_list = 1; + * @param value the unfinishedMainMissionIdList to add + * @return this + */ + public GetMissionStatusScRsp addUnfinishedMainMissionIdList(final int value) { + bitField0_ |= 0x00000002; + unfinishedMainMissionIdList.add(value); + return this; + } + + /** + * repeated uint32 unfinished_main_mission_id_list = 1; + * @param values the unfinishedMainMissionIdList to add + * @return this + */ + public GetMissionStatusScRsp addAllUnfinishedMainMissionIdList(final int... values) { + bitField0_ |= 0x00000002; + unfinishedMainMissionIdList.addAll(values); + return this; + } + /** * repeated uint32 finished_main_mission_id_list = 6; * @return whether the finishedMainMissionIdList field is set */ public boolean hasFinishedMainMissionIdList() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -110,7 +178,7 @@ public final class GetMissionStatusScRspOuterClass { * @return this */ public GetMissionStatusScRsp clearFinishedMainMissionIdList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; finishedMainMissionIdList.clear(); return this; } @@ -139,7 +207,7 @@ public final class GetMissionStatusScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableFinishedMainMissionIdList() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return finishedMainMissionIdList; } @@ -149,7 +217,7 @@ public final class GetMissionStatusScRspOuterClass { * @return this */ public GetMissionStatusScRsp addFinishedMainMissionIdList(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; finishedMainMissionIdList.add(value); return this; } @@ -160,31 +228,31 @@ public final class GetMissionStatusScRspOuterClass { * @return this */ public GetMissionStatusScRsp addAllFinishedMainMissionIdList(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; finishedMainMissionIdList.addAll(values); return this; } /** - * repeated uint32 disabled_main_mission_id_list = 8; + * repeated uint32 disabled_main_mission_id_list = 13; * @return whether the disabledMainMissionIdList field is set */ public boolean hasDisabledMainMissionIdList() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 disabled_main_mission_id_list = 8; + * repeated uint32 disabled_main_mission_id_list = 13; * @return this */ public GetMissionStatusScRsp clearDisabledMainMissionIdList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; disabledMainMissionIdList.clear(); return this; } /** - * repeated uint32 disabled_main_mission_id_list = 8; + * repeated uint32 disabled_main_mission_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. @@ -198,7 +266,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 8; + * repeated uint32 disabled_main_mission_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 @@ -207,189 +275,52 @@ public final class GetMissionStatusScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableDisabledMainMissionIdList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return disabledMainMissionIdList; } /** - * repeated uint32 disabled_main_mission_id_list = 8; + * repeated uint32 disabled_main_mission_id_list = 13; * @param value the disabledMainMissionIdList to add * @return this */ public GetMissionStatusScRsp addDisabledMainMissionIdList(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; disabledMainMissionIdList.add(value); return this; } /** - * repeated uint32 disabled_main_mission_id_list = 8; + * repeated uint32 disabled_main_mission_id_list = 13; * @param values the disabledMainMissionIdList to add * @return this */ public GetMissionStatusScRsp addAllDisabledMainMissionIdList(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; disabledMainMissionIdList.addAll(values); return this; } /** - * repeated uint32 unfinished_main_mission_id_list = 12; - * @return whether the unfinishedMainMissionIdList field is set + * repeated .Mission sub_mission_status_list = 8; + * @return whether the subMissionStatusList field is set */ - public boolean hasUnfinishedMainMissionIdList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 12; - * @return this - */ - public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { - bitField0_ &= ~0x00000008; - unfinishedMainMissionIdList.clear(); - return this; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 12; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableUnfinishedMainMissionIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getUnfinishedMainMissionIdList() { - return unfinishedMainMissionIdList; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 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 getMutableUnfinishedMainMissionIdList() { - bitField0_ |= 0x00000008; - return unfinishedMainMissionIdList; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 12; - * @param value the unfinishedMainMissionIdList to add - * @return this - */ - public GetMissionStatusScRsp addUnfinishedMainMissionIdList(final int value) { - bitField0_ |= 0x00000008; - unfinishedMainMissionIdList.add(value); - return this; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 12; - * @param values the unfinishedMainMissionIdList to add - * @return this - */ - public GetMissionStatusScRsp addAllUnfinishedMainMissionIdList(final int... values) { - bitField0_ |= 0x00000008; - unfinishedMainMissionIdList.addAll(values); - return this; - } - - /** - * repeated .Mission mission_event_status_list = 4; - * @return whether the missionEventStatusList field is set - */ - public boolean hasMissionEventStatusList() { + public boolean hasSubMissionStatusList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .Mission mission_event_status_list = 4; - * @return this - */ - public GetMissionStatusScRsp clearMissionEventStatusList() { - bitField0_ &= ~0x00000010; - missionEventStatusList.clear(); - return this; - } - - /** - * repeated .Mission mission_event_status_list = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * 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 = 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 getMutableMissionEventStatusList() { - bitField0_ |= 0x00000010; - return missionEventStatusList; - } - - /** - * repeated .Mission mission_event_status_list = 4; - * @param value the missionEventStatusList to add - * @return this - */ - public GetMissionStatusScRsp addMissionEventStatusList(final MissionOuterClass.Mission value) { - bitField0_ |= 0x00000010; - missionEventStatusList.add(value); - return this; - } - - /** - * repeated .Mission mission_event_status_list = 4; - * @param values the missionEventStatusList to add - * @return this - */ - public GetMissionStatusScRsp addAllMissionEventStatusList( - final MissionOuterClass.Mission... values) { - bitField0_ |= 0x00000010; - missionEventStatusList.addAll(values); - return this; - } - - /** - * repeated .Mission sub_mission_status_list = 14; - * @return whether the subMissionStatusList field is set - */ - public boolean hasSubMissionStatusList() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 8; * @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 = 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. @@ -403,7 +334,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_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 @@ -412,44 +343,113 @@ 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 = 8; * @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 = 8; * @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 = 9; + * @return whether the missionEventStatusList field is set + */ + public boolean hasMissionEventStatusList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .Mission mission_event_status_list = 9; + * @return this + */ + public GetMissionStatusScRsp clearMissionEventStatusList() { + bitField0_ &= ~0x00000020; + missionEventStatusList.clear(); + return this; + } + + /** + * repeated .Mission mission_event_status_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 #getMutableMissionEventStatusList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMissionEventStatusList() { + return missionEventStatusList; + } + + /** + * repeated .Mission mission_event_status_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 getMutableMissionEventStatusList() { + bitField0_ |= 0x00000020; + return missionEventStatusList; + } + + /** + * repeated .Mission mission_event_status_list = 9; + * @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 = 9; + * @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; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; + unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList); finishedMainMissionIdList.copyFrom(other.finishedMainMissionIdList); disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList); - unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList); - missionEventStatusList.copyFrom(other.missionEventStatusList); subMissionStatusList.copyFrom(other.subMissionStatusList); + missionEventStatusList.copyFrom(other.missionEventStatusList); } return this; } @@ -463,21 +463,21 @@ public final class GetMissionStatusScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasUnfinishedMainMissionIdList()) { + getMutableUnfinishedMainMissionIdList().addAll(other.unfinishedMainMissionIdList); + } if (other.hasFinishedMainMissionIdList()) { getMutableFinishedMainMissionIdList().addAll(other.finishedMainMissionIdList); } if (other.hasDisabledMainMissionIdList()) { getMutableDisabledMainMissionIdList().addAll(other.disabledMainMissionIdList); } - if (other.hasUnfinishedMainMissionIdList()) { - getMutableUnfinishedMainMissionIdList().addAll(other.unfinishedMainMissionIdList); + if (other.hasSubMissionStatusList()) { + getMutableSubMissionStatusList().addAll(other.subMissionStatusList); } if (other.hasMissionEventStatusList()) { getMutableMissionEventStatusList().addAll(other.missionEventStatusList); } - if (other.hasSubMissionStatusList()) { - getMutableSubMissionStatusList().addAll(other.subMissionStatusList); - } return this; } @@ -489,11 +489,11 @@ public final class GetMissionStatusScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; + unfinishedMainMissionIdList.clear(); finishedMainMissionIdList.clear(); disabledMainMissionIdList.clear(); - unfinishedMainMissionIdList.clear(); - missionEventStatusList.clear(); subMissionStatusList.clear(); + missionEventStatusList.clear(); return this; } @@ -504,11 +504,11 @@ public final class GetMissionStatusScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + unfinishedMainMissionIdList.clear(); finishedMainMissionIdList.clear(); disabledMainMissionIdList.clear(); - unfinishedMainMissionIdList.clear(); - missionEventStatusList.clearQuick(); subMissionStatusList.clearQuick(); + missionEventStatusList.clearQuick(); return this; } @@ -523,47 +523,47 @@ public final class GetMissionStatusScRspOuterClass { GetMissionStatusScRsp other = (GetMissionStatusScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) + && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList)) && (!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)); + && (!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) 88); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { + for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]); + } + } + if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < finishedMainMissionIdList.length(); i++) { output.writeRawByte((byte) 48); output.writeUInt32NoTag(finishedMainMissionIdList.array()[i]); } } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < disabledMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(disabledMainMissionIdList.array()[i]); } } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]); - } - } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < missionEventStatusList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(missionEventStatusList.get(i)); + for (int i = 0; i < subMissionStatusList.length(); i++) { + output.writeRawByte((byte) 66); + 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) 74); + output.writeMessageNoTag(missionEventStatusList.get(i)); } } } @@ -575,19 +575,19 @@ public final class GetMissionStatusScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - 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_ & 0x00000004) != 0) { + size += (1 * finishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(finishedMainMissionIdList); + } + 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,11 +599,20 @@ public final class GetMissionStatusScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // unfinishedMainMissionIdList [packed=true] + input.readPackedUInt32(unfinishedMainMissionIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 50) { break; } @@ -611,41 +620,32 @@ public final class GetMissionStatusScRspOuterClass { case 50: { // finishedMainMissionIdList [packed=true] input.readPackedUInt32(finishedMainMissionIdList, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // disabledMainMissionIdList [packed=true] + input.readPackedUInt32(disabledMainMissionIdList, tag); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 66) { break; } } case 66: { - // disabledMainMissionIdList [packed=true] - input.readPackedUInt32(disabledMainMissionIdList, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // unfinishedMainMissionIdList [packed=true] - input.readPackedUInt32(unfinishedMainMissionIdList, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // missionEventStatusList - tag = input.readRepeatedMessage(missionEventStatusList, tag); - bitField0_ |= 0x00000010; - if (tag != 114) { - break; - } - } - case 114: { // subMissionStatusList tag = input.readRepeatedMessage(subMissionStatusList, tag); + bitField0_ |= 0x00000010; + if (tag != 74) { + break; + } + } + case 74: { + // missionEventStatusList + tag = input.readRepeatedMessage(missionEventStatusList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -661,21 +661,21 @@ public final class GetMissionStatusScRspOuterClass { tag = input.readTag(); break; } - case 48: { - // finishedMainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag); + case 8: { + // unfinishedMainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000002; break; } - case 64: { - // disabledMainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); + case 48: { + // finishedMainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000004; break; } - case 96: { - // unfinishedMainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); + case 104: { + // disabledMainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); bitField0_ |= 0x00000008; break; } @@ -690,19 +690,19 @@ public final class GetMissionStatusScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - 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_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.finishedMainMissionIdList, finishedMainMissionIdList); + } + 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(); } @@ -725,12 +725,24 @@ public final class GetMissionStatusScRspOuterClass { } break; } + case 61133057: + case 1704637629: { + if (input.isAtField(FieldNames.unfinishedMainMissionIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(unfinishedMainMissionIdList); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 104231290: case -1929023306: { if (input.isAtField(FieldNames.finishedMainMissionIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(finishedMainMissionIdList); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -742,18 +754,6 @@ public final class GetMissionStatusScRspOuterClass { if (input.isAtField(FieldNames.disabledMainMissionIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(disabledMainMissionIdList); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 61133057: - case 1704637629: { - if (input.isAtField(FieldNames.unfinishedMainMissionIdList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(unfinishedMainMissionIdList); 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 { @@ -840,15 +840,15 @@ public final class GetMissionStatusScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName unfinishedMainMissionIdList = FieldName.forField("unfinishedMainMissionIdList", "unfinished_main_mission_id_list"); + 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 subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list"); - - static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMultiPathAvatarInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMultiPathAvatarInfoScRspOuterClass.java index f634bd6..77a9327 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMultiPathAvatarInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMultiPathAvatarInfoScRspOuterClass.java @@ -21,25 +21,25 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated uint32 basic_type_id_list = 15; + * repeated uint32 basic_type_id_list = 4; */ private final RepeatedInt basicTypeIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; - */ - private final RepeatedMessage curAvatarPath = RepeatedMessage.newEmptyInstance(CurAvatarPathEntry.getFactory()); - - /** - * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 2; */ private final RepeatedMessage multiPathAvatarInfoList = RepeatedMessage.newEmptyInstance(MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo.getFactory()); + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 13; + */ + private final RepeatedMessage curAvatarPath = RepeatedMessage.newEmptyInstance(CurAvatarPathEntry.getFactory()); + private GetMultiPathAvatarInfoScRsp() { } @@ -51,7 +51,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -59,7 +59,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; * @return this */ public GetMultiPathAvatarInfoScRsp clearRetcode() { @@ -69,7 +69,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -77,7 +77,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -88,7 +88,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * repeated uint32 basic_type_id_list = 15; + * repeated uint32 basic_type_id_list = 4; * @return whether the basicTypeIdList field is set */ public boolean hasBasicTypeIdList() { @@ -96,7 +96,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * repeated uint32 basic_type_id_list = 15; + * repeated uint32 basic_type_id_list = 4; * @return this */ public GetMultiPathAvatarInfoScRsp clearBasicTypeIdList() { @@ -106,7 +106,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * repeated uint32 basic_type_id_list = 15; + * repeated uint32 basic_type_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. @@ -120,7 +120,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * repeated uint32 basic_type_id_list = 15; + * repeated uint32 basic_type_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 @@ -134,7 +134,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * repeated uint32 basic_type_id_list = 15; + * repeated uint32 basic_type_id_list = 4; * @param value the basicTypeIdList to add * @return this */ @@ -145,7 +145,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * repeated uint32 basic_type_id_list = 15; + * repeated uint32 basic_type_id_list = 4; * @param values the basicTypeIdList to add * @return this */ @@ -156,93 +156,25 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; - * @return whether the curAvatarPath field is set + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 2; + * @return whether the multiPathAvatarInfoList field is set */ - public boolean hasCurAvatarPath() { + public boolean hasMultiPathAvatarInfoList() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; - * @return this - */ - public GetMultiPathAvatarInfoScRsp clearCurAvatarPath() { - bitField0_ &= ~0x00000004; - curAvatarPath.clear(); - return this; - } - - /** - * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableCurAvatarPath()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getCurAvatarPath() { - return curAvatarPath; - } - - /** - * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableCurAvatarPath() { - bitField0_ |= 0x00000004; - return curAvatarPath; - } - - /** - * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; - * @param value the curAvatarPath to add - * @return this - */ - public GetMultiPathAvatarInfoScRsp addCurAvatarPath(final CurAvatarPathEntry value) { - bitField0_ |= 0x00000004; - curAvatarPath.add(value); - return this; - } - - /** - * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; - * @param values the curAvatarPath to add - * @return this - */ - public GetMultiPathAvatarInfoScRsp addAllCurAvatarPath(final CurAvatarPathEntry... values) { - bitField0_ |= 0x00000004; - curAvatarPath.addAll(values); - return this; - } - - /** - * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; - * @return whether the multiPathAvatarInfoList field is set - */ - public boolean hasMultiPathAvatarInfoList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 2; * @return this */ public GetMultiPathAvatarInfoScRsp clearMultiPathAvatarInfoList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; multiPathAvatarInfoList.clear(); return this; } /** - * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * repeated .MultiPathAvatarInfo multi_path_avatar_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. @@ -257,7 +189,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } /** - * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * repeated .MultiPathAvatarInfo multi_path_avatar_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 @@ -267,34 +199,102 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { */ public RepeatedMessage getMutableMultiPathAvatarInfoList( ) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return multiPathAvatarInfoList; } /** - * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 2; * @param value the multiPathAvatarInfoList to add * @return this */ public GetMultiPathAvatarInfoScRsp addMultiPathAvatarInfoList( final MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; multiPathAvatarInfoList.add(value); return this; } /** - * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 2; * @param values the multiPathAvatarInfoList to add * @return this */ public GetMultiPathAvatarInfoScRsp addAllMultiPathAvatarInfoList( final MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; multiPathAvatarInfoList.addAll(values); return this; } + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 13; + * @return whether the curAvatarPath field is set + */ + public boolean hasCurAvatarPath() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 13; + * @return this + */ + public GetMultiPathAvatarInfoScRsp clearCurAvatarPath() { + bitField0_ &= ~0x00000008; + curAvatarPath.clear(); + return this; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 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 #getMutableCurAvatarPath()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getCurAvatarPath() { + return curAvatarPath; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 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 getMutableCurAvatarPath() { + bitField0_ |= 0x00000008; + return curAvatarPath; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 13; + * @param value the curAvatarPath to add + * @return this + */ + public GetMultiPathAvatarInfoScRsp addCurAvatarPath(final CurAvatarPathEntry value) { + bitField0_ |= 0x00000008; + curAvatarPath.add(value); + return this; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 13; + * @param values the curAvatarPath to add + * @return this + */ + public GetMultiPathAvatarInfoScRsp addAllCurAvatarPath(final CurAvatarPathEntry... values) { + bitField0_ |= 0x00000008; + curAvatarPath.addAll(values); + return this; + } + @Override public GetMultiPathAvatarInfoScRsp copyFrom(final GetMultiPathAvatarInfoScRsp other) { cachedSize = other.cachedSize; @@ -302,8 +302,8 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { bitField0_ = other.bitField0_; retcode = other.retcode; basicTypeIdList.copyFrom(other.basicTypeIdList); - curAvatarPath.copyFrom(other.curAvatarPath); multiPathAvatarInfoList.copyFrom(other.multiPathAvatarInfoList); + curAvatarPath.copyFrom(other.curAvatarPath); } return this; } @@ -320,12 +320,12 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { if (other.hasBasicTypeIdList()) { getMutableBasicTypeIdList().addAll(other.basicTypeIdList); } - if (other.hasCurAvatarPath()) { - getMutableCurAvatarPath().addAll(other.curAvatarPath); - } if (other.hasMultiPathAvatarInfoList()) { getMutableMultiPathAvatarInfoList().addAll(other.multiPathAvatarInfoList); } + if (other.hasCurAvatarPath()) { + getMutableCurAvatarPath().addAll(other.curAvatarPath); + } return this; } @@ -338,8 +338,8 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { bitField0_ = 0; retcode = 0; basicTypeIdList.clear(); - curAvatarPath.clear(); multiPathAvatarInfoList.clear(); + curAvatarPath.clear(); return this; } @@ -351,8 +351,8 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { cachedSize = -1; bitField0_ = 0; basicTypeIdList.clear(); - curAvatarPath.clearQuick(); multiPathAvatarInfoList.clearQuick(); + curAvatarPath.clearQuick(); return this; } @@ -368,32 +368,32 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) && (!hasBasicTypeIdList() || basicTypeIdList.equals(other.basicTypeIdList)) - && (!hasCurAvatarPath() || curAvatarPath.equals(other.curAvatarPath)) - && (!hasMultiPathAvatarInfoList() || multiPathAvatarInfoList.equals(other.multiPathAvatarInfoList)); + && (!hasMultiPathAvatarInfoList() || multiPathAvatarInfoList.equals(other.multiPathAvatarInfoList)) + && (!hasCurAvatarPath() || curAvatarPath.equals(other.curAvatarPath)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < basicTypeIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(basicTypeIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < curAvatarPath.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(curAvatarPath.get(i)); + for (int i = 0; i < multiPathAvatarInfoList.length(); i++) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(multiPathAvatarInfoList.get(i)); } } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < multiPathAvatarInfoList.length(); i++) { + for (int i = 0; i < curAvatarPath.length(); i++) { output.writeRawByte((byte) 106); - output.writeMessageNoTag(multiPathAvatarInfoList.get(i)); + output.writeMessageNoTag(curAvatarPath.get(i)); } } } @@ -408,10 +408,10 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { size += (1 * basicTypeIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(basicTypeIdList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * curAvatarPath.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(curAvatarPath); + size += (1 * multiPathAvatarInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(multiPathAvatarInfoList); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * multiPathAvatarInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(multiPathAvatarInfoList); + size += (1 * curAvatarPath.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(curAvatarPath); } return size; } @@ -423,35 +423,35 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { - // basicTypeIdList [packed=true] - input.readPackedUInt32(basicTypeIdList, tag); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 34) { break; } } case 34: { - // curAvatarPath - tag = input.readRepeatedMessage(curAvatarPath, tag); + // basicTypeIdList [packed=true] + input.readPackedUInt32(basicTypeIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // multiPathAvatarInfoList + tag = input.readRepeatedMessage(multiPathAvatarInfoList, tag); bitField0_ |= 0x00000004; if (tag != 106) { break; } } case 106: { - // multiPathAvatarInfoList - tag = input.readRepeatedMessage(multiPathAvatarInfoList, tag); + // curAvatarPath + tag = input.readRepeatedMessage(curAvatarPath, tag); bitField0_ |= 0x00000008; if (tag != 0) { break; @@ -467,7 +467,7 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { tag = input.readTag(); break; } - case 120: { + case 32: { // basicTypeIdList [packed=false] tag = input.readRepeatedUInt32(basicTypeIdList, tag); bitField0_ |= 0x00000002; @@ -487,10 +487,10 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { output.writeRepeatedUInt32(FieldNames.basicTypeIdList, basicTypeIdList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.curAvatarPath, curAvatarPath); + output.writeRepeatedMessage(FieldNames.multiPathAvatarInfoList, multiPathAvatarInfoList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.multiPathAvatarInfoList, multiPathAvatarInfoList); + output.writeRepeatedMessage(FieldNames.curAvatarPath, curAvatarPath); } output.endObject(); } @@ -525,11 +525,11 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } break; } - case 1836831614: - case 589876172: { - if (input.isAtField(FieldNames.curAvatarPath)) { + case -1198530685: + case -2042493827: { + if (input.isAtField(FieldNames.multiPathAvatarInfoList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(curAvatarPath); + input.readRepeatedMessage(multiPathAvatarInfoList); bitField0_ |= 0x00000004; } } else { @@ -537,11 +537,11 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { } break; } - case -1198530685: - case -2042493827: { - if (input.isAtField(FieldNames.multiPathAvatarInfoList)) { + case 1836831614: + case 589876172: { + if (input.isAtField(FieldNames.curAvatarPath)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(multiPathAvatarInfoList); + input.readRepeatedMessage(curAvatarPath); bitField0_ |= 0x00000008; } } else { @@ -966,9 +966,9 @@ public final class GetMultiPathAvatarInfoScRspOuterClass { static final FieldName basicTypeIdList = FieldName.forField("basicTypeIdList", "basic_type_id_list"); - static final FieldName curAvatarPath = FieldName.forField("curAvatarPath", "cur_avatar_path"); - static final FieldName multiPathAvatarInfoList = FieldName.forField("multiPathAvatarInfoList", "multi_path_avatar_info_list"); + + static final FieldName curAvatarPath = FieldName.forField("curAvatarPath", "cur_avatar_path"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java index a76d216..53edf8f 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 = 15; + * optional uint32 npc_id = 8; */ private int npcId; @@ -34,7 +34,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 8; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -42,7 +42,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 8; * @return this */ public GetNpcTakenRewardCsReq clearNpcId() { @@ -52,7 +52,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 8; * @return the npcId */ public int getNpcId() { @@ -60,7 +60,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 8; * @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) 120); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(npcId); } } @@ -150,7 +150,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 64: { // 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 f05442e..4ada4c4 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 npc_id = 2; - */ - private int npcId; - - /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; */ private int retcode; + /** + * optional uint32 npc_id = 14; + */ + private int npcId; + private GetNpcTakenRewardScRsp() { } @@ -39,62 +39,25 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 npc_id = 2; - * @return whether the npcId field is set + * optional uint32 retcode = 5; + * @return whether the retcode field is set */ - public boolean hasNpcId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 npc_id = 2; - * @return this - */ - public GetNpcTakenRewardScRsp clearNpcId() { - bitField0_ &= ~0x00000001; - npcId = 0; - return this; - } - - /** - * optional uint32 npc_id = 2; - * @return the npcId - */ - public int getNpcId() { - return npcId; - } - - /** - * optional uint32 npc_id = 2; - * @param value the npcId to set - * @return this - */ - public GetNpcTakenRewardScRsp setNpcId(final int value) { - bitField0_ |= 0x00000001; - npcId = 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 = 5; * @return this */ public GetNpcTakenRewardScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ public GetNpcTakenRewardScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 npc_id = 14; + * @return whether the npcId field is set + */ + public boolean hasNpcId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 npc_id = 14; + * @return this + */ + public GetNpcTakenRewardScRsp clearNpcId() { + bitField0_ &= ~0x00000002; + npcId = 0; + return this; + } + + /** + * optional uint32 npc_id = 14; + * @return the npcId + */ + public int getNpcId() { + return npcId; + } + + /** + * optional uint32 npc_id = 14; + * @param value the npcId to set + * @return this + */ + public GetNpcTakenRewardScRsp setNpcId(final int value) { + bitField0_ |= 0x00000002; + npcId = value; + return this; + } + @Override public GetNpcTakenRewardScRsp copyFrom(final GetNpcTakenRewardScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - npcId = other.npcId; retcode = other.retcode; + npcId = other.npcId; } return this; } @@ -129,12 +129,12 @@ public final class GetNpcTakenRewardScRspOuterClass { return this; } cachedSize = -1; - if (other.hasNpcId()) { - setNpcId(other.npcId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasNpcId()) { + setNpcId(other.npcId); + } return this; } @@ -145,8 +145,8 @@ public final class GetNpcTakenRewardScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - npcId = 0; retcode = 0; + npcId = 0; return this; } @@ -170,19 +170,19 @@ public final class GetNpcTakenRewardScRspOuterClass { } GetNpcTakenRewardScRsp other = (GetNpcTakenRewardScRsp) o; return bitField0_ == other.bitField0_ - && (!hasNpcId() || npcId == other.npcId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasNpcId() || npcId == other.npcId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(npcId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(npcId); } } @@ -190,10 +190,10 @@ public final class GetNpcTakenRewardScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); } return size; } @@ -205,18 +205,18 @@ public final class GetNpcTakenRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // npcId - npcId = input.readUInt32(); + case 40: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 112) { break; } } - case 32: { - // retcode - retcode = input.readUInt32(); + case 112: { + // npcId + npcId = 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.npcId, npcId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.npcId, npcId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class GetNpcTakenRewardScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class GetNpcTakenRewardScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class GetNpcTakenRewardScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName npcId = FieldName.forField("npcId", "npc_id"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName npcId = FieldName.forField("npcId", "npc_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPetDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPetDataScRspOuterClass.java new file mode 100644 index 0000000..7cfff24 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/GetPetDataScRspOuterClass.java @@ -0,0 +1,462 @@ +// 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 GetPetDataScRspOuterClass { + /** + * Protobuf type {@code GetPetDataScRsp} + */ + public static final class GetPetDataScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 cur_pet_id = 5; + */ + private int curPetId; + + /** + * optional uint32 retcode = 6; + */ + private int retcode; + + /** + * repeated uint32 pet_id_list = 10; + */ + private final RepeatedInt petIdList = RepeatedInt.newEmptyInstance(); + + private GetPetDataScRsp() { + } + + /** + * @return a new empty instance of {@code GetPetDataScRsp} + */ + public static GetPetDataScRsp newInstance() { + return new GetPetDataScRsp(); + } + + /** + * optional uint32 cur_pet_id = 5; + * @return whether the curPetId field is set + */ + public boolean hasCurPetId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 cur_pet_id = 5; + * @return this + */ + public GetPetDataScRsp clearCurPetId() { + bitField0_ &= ~0x00000001; + curPetId = 0; + return this; + } + + /** + * optional uint32 cur_pet_id = 5; + * @return the curPetId + */ + public int getCurPetId() { + return curPetId; + } + + /** + * optional uint32 cur_pet_id = 5; + * @param value the curPetId to set + * @return this + */ + public GetPetDataScRsp setCurPetId(final int value) { + bitField0_ |= 0x00000001; + curPetId = value; + return this; + } + + /** + * optional uint32 retcode = 6; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 6; + * @return this + */ + public GetPetDataScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 6; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 6; + * @param value the retcode to set + * @return this + */ + public GetPetDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * repeated uint32 pet_id_list = 10; + * @return whether the petIdList field is set + */ + public boolean hasPetIdList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated uint32 pet_id_list = 10; + * @return this + */ + public GetPetDataScRsp clearPetIdList() { + bitField0_ &= ~0x00000004; + petIdList.clear(); + return this; + } + + /** + * repeated uint32 pet_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 #getMutablePetIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getPetIdList() { + return petIdList; + } + + /** + * repeated uint32 pet_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 getMutablePetIdList() { + bitField0_ |= 0x00000004; + return petIdList; + } + + /** + * repeated uint32 pet_id_list = 10; + * @param value the petIdList to add + * @return this + */ + public GetPetDataScRsp addPetIdList(final int value) { + bitField0_ |= 0x00000004; + petIdList.add(value); + return this; + } + + /** + * repeated uint32 pet_id_list = 10; + * @param values the petIdList to add + * @return this + */ + public GetPetDataScRsp addAllPetIdList(final int... values) { + bitField0_ |= 0x00000004; + petIdList.addAll(values); + return this; + } + + @Override + public GetPetDataScRsp copyFrom(final GetPetDataScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + curPetId = other.curPetId; + retcode = other.retcode; + petIdList.copyFrom(other.petIdList); + } + return this; + } + + @Override + public GetPetDataScRsp mergeFrom(final GetPetDataScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasCurPetId()) { + setCurPetId(other.curPetId); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasPetIdList()) { + getMutablePetIdList().addAll(other.petIdList); + } + return this; + } + + @Override + public GetPetDataScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + curPetId = 0; + retcode = 0; + petIdList.clear(); + return this; + } + + @Override + public GetPetDataScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + petIdList.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof GetPetDataScRsp)) { + return false; + } + GetPetDataScRsp other = (GetPetDataScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasCurPetId() || curPetId == other.curPetId) + && (!hasRetcode() || retcode == other.retcode) + && (!hasPetIdList() || petIdList.equals(other.petIdList)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(curPetId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < petIdList.length(); i++) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(petIdList.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curPetId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * petIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(petIdList); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public GetPetDataScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 40: { + // curPetId + curPetId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // petIdList [packed=true] + input.readPackedUInt32(petIdList, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 80: { + // petIdList [packed=false] + tag = input.readRepeatedUInt32(petIdList, tag); + bitField0_ |= 0x00000004; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.curPetId, curPetId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.petIdList, petIdList); + } + output.endObject(); + } + + @Override + public GetPetDataScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 544007226: + case -465065190: { + if (input.isAtField(FieldNames.curPetId)) { + if (!input.trySkipNullValue()) { + curPetId = 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 1414608472: + case -1558569438: { + if (input.isAtField(FieldNames.petIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(petIdList); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public GetPetDataScRsp clone() { + return new GetPetDataScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static GetPetDataScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new GetPetDataScRsp(), data).checkInitialized(); + } + + public static GetPetDataScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetPetDataScRsp(), input).checkInitialized(); + } + + public static GetPetDataScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetPetDataScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating GetPetDataScRsp messages + */ + public static MessageFactory getFactory() { + return GetPetDataScRspFactory.INSTANCE; + } + + private enum GetPetDataScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public GetPetDataScRsp create() { + return GetPetDataScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName curPetId = FieldName.forField("curPetId", "cur_pet_id"); + + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName petIdList = FieldName.forField("petIdList", "pet_id_list"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java index be32df6..20be859 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java @@ -25,25 +25,25 @@ public final class GetPhoneDataScRspOuterClass { private int retcode; /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 2; */ private int curPhoneTheme; /** - * optional uint32 cur_chat_bubble = 15; + * optional uint32 cur_chat_bubble = 3; */ private int curChatBubble; /** - * repeated uint32 owned_chat_bubbles = 5; - */ - private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 owned_phone_themes = 13; + * repeated uint32 owned_phone_themes = 6; */ private final RepeatedInt ownedPhoneThemes = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 owned_chat_bubbles = 9; + */ + private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); + private GetPhoneDataScRsp() { } @@ -92,7 +92,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 2; * @return whether the curPhoneTheme field is set */ public boolean hasCurPhoneTheme() { @@ -100,7 +100,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 2; * @return this */ public GetPhoneDataScRsp clearCurPhoneTheme() { @@ -110,7 +110,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 2; * @return the curPhoneTheme */ public int getCurPhoneTheme() { @@ -118,7 +118,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 2; * @param value the curPhoneTheme to set * @return this */ @@ -129,7 +129,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_chat_bubble = 15; + * optional uint32 cur_chat_bubble = 3; * @return whether the curChatBubble field is set */ public boolean hasCurChatBubble() { @@ -137,7 +137,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_chat_bubble = 15; + * optional uint32 cur_chat_bubble = 3; * @return this */ public GetPhoneDataScRsp clearCurChatBubble() { @@ -147,7 +147,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_chat_bubble = 15; + * optional uint32 cur_chat_bubble = 3; * @return the curChatBubble */ public int getCurChatBubble() { @@ -155,7 +155,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_chat_bubble = 15; + * optional uint32 cur_chat_bubble = 3; * @param value the curChatBubble to set * @return this */ @@ -166,93 +166,25 @@ public final class GetPhoneDataScRspOuterClass { } /** - * repeated uint32 owned_chat_bubbles = 5; - * @return whether the ownedChatBubbles field is set + * repeated uint32 owned_phone_themes = 6; + * @return whether the ownedPhoneThemes field is set */ - public boolean hasOwnedChatBubbles() { + public boolean hasOwnedPhoneThemes() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 owned_chat_bubbles = 5; - * @return this - */ - public GetPhoneDataScRsp clearOwnedChatBubbles() { - bitField0_ &= ~0x00000008; - ownedChatBubbles.clear(); - return this; - } - - /** - * repeated uint32 owned_chat_bubbles = 5; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * 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 = 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 getMutableOwnedChatBubbles() { - bitField0_ |= 0x00000008; - return ownedChatBubbles; - } - - /** - * repeated uint32 owned_chat_bubbles = 5; - * @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 = 5; - * @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 = 13; - * @return whether the ownedPhoneThemes field is set - */ - public boolean hasOwnedPhoneThemes() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 owned_phone_themes = 13; + * repeated uint32 owned_phone_themes = 6; * @return this */ public GetPhoneDataScRsp clearOwnedPhoneThemes() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; ownedPhoneThemes.clear(); return this; } /** - * repeated uint32 owned_phone_themes = 13; + * repeated uint32 owned_phone_themes = 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. @@ -266,7 +198,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * repeated uint32 owned_phone_themes = 13; + * repeated uint32 owned_phone_themes = 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 @@ -275,32 +207,100 @@ public final class GetPhoneDataScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableOwnedPhoneThemes() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return ownedPhoneThemes; } /** - * repeated uint32 owned_phone_themes = 13; + * repeated uint32 owned_phone_themes = 6; * @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 = 13; + * repeated uint32 owned_phone_themes = 6; * @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 = 9; + * @return whether the ownedChatBubbles field is set + */ + public boolean hasOwnedChatBubbles() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated uint32 owned_chat_bubbles = 9; + * @return this + */ + public GetPhoneDataScRsp clearOwnedChatBubbles() { + bitField0_ &= ~0x00000010; + ownedChatBubbles.clear(); + return this; + } + + /** + * repeated uint32 owned_chat_bubbles = 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 #getMutableOwnedChatBubbles()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getOwnedChatBubbles() { + return ownedChatBubbles; + } + + /** + * repeated uint32 owned_chat_bubbles = 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 getMutableOwnedChatBubbles() { + bitField0_ |= 0x00000010; + return ownedChatBubbles; + } + + /** + * repeated uint32 owned_chat_bubbles = 9; + * @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 = 9; + * @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; @@ -309,8 +309,8 @@ public final class GetPhoneDataScRspOuterClass { retcode = other.retcode; curPhoneTheme = other.curPhoneTheme; curChatBubble = other.curChatBubble; - ownedChatBubbles.copyFrom(other.ownedChatBubbles); ownedPhoneThemes.copyFrom(other.ownedPhoneThemes); + ownedChatBubbles.copyFrom(other.ownedChatBubbles); } return this; } @@ -330,12 +330,12 @@ public final class GetPhoneDataScRspOuterClass { if (other.hasCurChatBubble()) { setCurChatBubble(other.curChatBubble); } - if (other.hasOwnedChatBubbles()) { - getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); - } if (other.hasOwnedPhoneThemes()) { getMutableOwnedPhoneThemes().addAll(other.ownedPhoneThemes); } + if (other.hasOwnedChatBubbles()) { + getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); + } return this; } @@ -349,8 +349,8 @@ public final class GetPhoneDataScRspOuterClass { retcode = 0; curPhoneTheme = 0; curChatBubble = 0; - ownedChatBubbles.clear(); 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; } @@ -379,8 +379,8 @@ public final class GetPhoneDataScRspOuterClass { && (!hasRetcode() || retcode == other.retcode) && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme) && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) - && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)) - && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)); + && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)) + && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)); } @Override @@ -390,23 +390,23 @@ public final class GetPhoneDataScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(curPhoneTheme); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(curChatBubble); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < ownedChatBubbles.length(); i++) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(ownedChatBubbles.array()[i]); + for (int i = 0; i < ownedPhoneThemes.length(); i++) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < ownedPhoneThemes.length(); i++) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); + for (int i = 0; i < ownedChatBubbles.length(); i++) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(ownedChatBubbles.array()[i]); } } } @@ -424,10 +424,10 @@ public final class GetPhoneDataScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); } 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; } @@ -444,40 +444,40 @@ public final class GetPhoneDataScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 16) { break; } } - case 112: { + case 16: { // curPhoneTheme curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 24) { break; } } - case 120: { + case 24: { // curChatBubble curChatBubble = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 50) { break; } } - case 42: { - // ownedChatBubbles [packed=true] - input.readPackedUInt32(ownedChatBubbles, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { + case 50: { // ownedPhoneThemes [packed=true] input.readPackedUInt32(ownedPhoneThemes, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // 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 40: { - // ownedChatBubbles [packed=false] - tag = input.readRepeatedUInt32(ownedChatBubbles, tag); + case 48: { + // ownedPhoneThemes [packed=false] + tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); bitField0_ |= 0x00000008; break; } - case 104: { - // ownedPhoneThemes [packed=false] - tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); + case 72: { + // ownedChatBubbles [packed=false] + tag = input.readRepeatedUInt32(ownedChatBubbles, tag); bitField0_ |= 0x00000010; break; } @@ -523,10 +523,10 @@ public final class GetPhoneDataScRspOuterClass { output.writeUInt32(FieldNames.curChatBubble, curChatBubble); } 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(); } @@ -573,11 +573,11 @@ public final class GetPhoneDataScRspOuterClass { } break; } - case -1579353334: - case -1491735846: { - if (input.isAtField(FieldNames.ownedChatBubbles)) { + case -512676109: + case -1128638699: { + if (input.isAtField(FieldNames.ownedPhoneThemes)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(ownedChatBubbles); + input.readRepeatedUInt32(ownedPhoneThemes); bitField0_ |= 0x00000008; } } else { @@ -585,11 +585,11 @@ public final class GetPhoneDataScRspOuterClass { } break; } - case -512676109: - case -1128638699: { - if (input.isAtField(FieldNames.ownedPhoneThemes)) { + case -1579353334: + case -1491735846: { + if (input.isAtField(FieldNames.ownedChatBubbles)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(ownedPhoneThemes); + input.readRepeatedUInt32(ownedChatBubbles); bitField0_ |= 0x00000010; } } else { @@ -656,9 +656,9 @@ public final class GetPhoneDataScRspOuterClass { static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); - static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles"); - static final FieldName ownedPhoneThemes = FieldName.forField("ownedPhoneThemes", "owned_phone_themes"); + + static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java index 2fd781c..6eef56b 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java @@ -21,33 +21,33 @@ public final class GetPlayerBoardDataScRspOuterClass { public static final class GetPlayerBoardDataScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 current_head_icon_id = 8; - */ - private int currentHeadIconId; - /** * optional uint32 retcode = 9; */ private int retcode; /** - * optional .DisplayAvatarVec display_avatar_vec = 10; + * optional uint32 current_head_icon_id = 14; + */ + private int currentHeadIconId; + + /** + * optional .DisplayAvatarVec display_avatar_vec = 4; */ private final DisplayAvatarVecOuterClass.DisplayAvatarVec displayAvatarVec = DisplayAvatarVecOuterClass.DisplayAvatarVec.newInstance(); /** - * optional string signature = 12; + * optional string signature = 13; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated uint32 display_support_avatar_vec = 4; + * repeated uint32 display_support_avatar_vec = 1; */ private final RepeatedInt displaySupportAvatarVec = RepeatedInt.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 1; + * repeated .HeadIcon unlocked_head_icon_list = 12; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -61,49 +61,12 @@ public final class GetPlayerBoardDataScRspOuterClass { return new GetPlayerBoardDataScRsp(); } - /** - * optional uint32 current_head_icon_id = 8; - * @return whether the currentHeadIconId field is set - */ - public boolean hasCurrentHeadIconId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 current_head_icon_id = 8; - * @return this - */ - public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { - bitField0_ &= ~0x00000001; - currentHeadIconId = 0; - return this; - } - - /** - * optional uint32 current_head_icon_id = 8; - * @return the currentHeadIconId - */ - public int getCurrentHeadIconId() { - return currentHeadIconId; - } - - /** - * optional uint32 current_head_icon_id = 8; - * @param value the currentHeadIconId to set - * @return this - */ - public GetPlayerBoardDataScRsp setCurrentHeadIconId(final int value) { - bitField0_ |= 0x00000001; - currentHeadIconId = value; - return this; - } - /** * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -111,7 +74,7 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return this */ public GetPlayerBoardDataScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } @@ -130,13 +93,50 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return this */ public GetPlayerBoardDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .DisplayAvatarVec display_avatar_vec = 10; + * optional uint32 current_head_icon_id = 14; + * @return whether the currentHeadIconId field is set + */ + public boolean hasCurrentHeadIconId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 current_head_icon_id = 14; + * @return this + */ + public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { + bitField0_ &= ~0x00000002; + currentHeadIconId = 0; + return this; + } + + /** + * optional uint32 current_head_icon_id = 14; + * @return the currentHeadIconId + */ + public int getCurrentHeadIconId() { + return currentHeadIconId; + } + + /** + * optional uint32 current_head_icon_id = 14; + * @param value the currentHeadIconId to set + * @return this + */ + public GetPlayerBoardDataScRsp setCurrentHeadIconId(final int value) { + bitField0_ |= 0x00000002; + currentHeadIconId = value; + return this; + } + + /** + * optional .DisplayAvatarVec display_avatar_vec = 4; * @return whether the displayAvatarVec field is set */ public boolean hasDisplayAvatarVec() { @@ -144,7 +144,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 10; + * optional .DisplayAvatarVec display_avatar_vec = 4; * @return this */ public GetPlayerBoardDataScRsp clearDisplayAvatarVec() { @@ -154,7 +154,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 10; + * optional .DisplayAvatarVec display_avatar_vec = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -168,7 +168,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 10; + * optional .DisplayAvatarVec display_avatar_vec = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -182,7 +182,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 10; + * optional .DisplayAvatarVec display_avatar_vec = 4; * @param value the displayAvatarVec to set * @return this */ @@ -194,7 +194,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 13; * @return whether the signature field is set */ public boolean hasSignature() { @@ -202,7 +202,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 13; * @return this */ public GetPlayerBoardDataScRsp clearSignature() { @@ -212,7 +212,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 13; * @return the signature */ public String getSignature() { @@ -220,7 +220,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 13; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -228,7 +228,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 13; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -237,7 +237,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 13; * @param value the signature to set * @return this */ @@ -248,7 +248,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 13; * @param value the signature to set * @return this */ @@ -259,7 +259,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 4; + * repeated uint32 display_support_avatar_vec = 1; * @return whether the displaySupportAvatarVec field is set */ public boolean hasDisplaySupportAvatarVec() { @@ -267,7 +267,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 4; + * repeated uint32 display_support_avatar_vec = 1; * @return this */ public GetPlayerBoardDataScRsp clearDisplaySupportAvatarVec() { @@ -277,7 +277,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 4; + * repeated uint32 display_support_avatar_vec = 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. @@ -291,7 +291,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 4; + * repeated uint32 display_support_avatar_vec = 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 @@ -305,7 +305,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 4; + * repeated uint32 display_support_avatar_vec = 1; * @param value the displaySupportAvatarVec to add * @return this */ @@ -316,7 +316,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 4; + * repeated uint32 display_support_avatar_vec = 1; * @param values the displaySupportAvatarVec to add * @return this */ @@ -327,7 +327,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 1; + * repeated .HeadIcon unlocked_head_icon_list = 12; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -335,7 +335,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 1; + * repeated .HeadIcon unlocked_head_icon_list = 12; * @return this */ public GetPlayerBoardDataScRsp clearUnlockedHeadIconList() { @@ -345,7 +345,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 1; + * repeated .HeadIcon unlocked_head_icon_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. @@ -359,7 +359,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 1; + * repeated .HeadIcon unlocked_head_icon_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 @@ -373,7 +373,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 1; + * repeated .HeadIcon unlocked_head_icon_list = 12; * @param value the unlockedHeadIconList to add * @return this */ @@ -385,7 +385,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 1; + * repeated .HeadIcon unlocked_head_icon_list = 12; * @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_; - currentHeadIconId = other.currentHeadIconId; retcode = other.retcode; + currentHeadIconId = other.currentHeadIconId; 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.hasCurrentHeadIconId()) { - setCurrentHeadIconId(other.currentHeadIconId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCurrentHeadIconId()) { + setCurrentHeadIconId(other.currentHeadIconId); + } if (other.hasDisplayAvatarVec()) { getMutableDisplayAvatarVec().mergeFrom(other.displayAvatarVec); } @@ -445,8 +445,8 @@ public final class GetPlayerBoardDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - currentHeadIconId = 0; retcode = 0; + currentHeadIconId = 0; displayAvatarVec.clear(); signature.clear(); displaySupportAvatarVec.clear(); @@ -478,8 +478,8 @@ public final class GetPlayerBoardDataScRspOuterClass { } GetPlayerBoardDataScRsp other = (GetPlayerBoardDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId) && (!hasRetcode() || retcode == other.retcode) + && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId) && (!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(currentHeadIconId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(currentHeadIconId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 34); output.writeMessageNoTag(displayAvatarVec); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 106); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < displaySupportAvatarVec.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(displaySupportAvatarVec.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 98); 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(currentHeadIconId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(currentHeadIconId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(displayAvatarVec); @@ -549,52 +549,52 @@ public final class GetPlayerBoardDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // currentHeadIconId - currentHeadIconId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } case 72: { // retcode retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // currentHeadIconId + currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // displayAvatarVec - input.readMessage(displayAvatarVec); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // signature - input.readString(signature); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 34) { break; } } case 34: { - // displaySupportAvatarVec [packed=true] - input.readPackedUInt32(displaySupportAvatarVec, tag); - bitField0_ |= 0x00000010; + // displayAvatarVec + input.readMessage(displayAvatarVec); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // signature + input.readString(signature); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 10) { break; } } case 10: { + // displaySupportAvatarVec [packed=true] + input.readPackedUInt32(displaySupportAvatarVec, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); bitField0_ |= 0x00000020; @@ -612,7 +612,7 @@ public final class GetPlayerBoardDataScRspOuterClass { tag = input.readTag(); break; } - case 32: { + case 8: { // 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.currentHeadIconId, currentHeadIconId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.currentHeadIconId, currentHeadIconId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.displayAvatarVec, displayAvatarVec); @@ -653,11 +653,10 @@ public final class GetPlayerBoardDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -665,10 +664,11 @@ public final class GetPlayerBoardDataScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -776,10 +776,10 @@ public final class GetPlayerBoardDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName currentHeadIconId = FieldName.forField("currentHeadIconId", "current_head_icon_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName currentHeadIconId = FieldName.forField("currentHeadIconId", "current_head_icon_id"); + 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 61bf1c3..ed44545 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 = 13; + * optional uint32 uid = 1; */ private int uid; @@ -34,7 +34,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 1; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 1; * @return this */ public GetPlayerDetailInfoCsReq clearUid() { @@ -52,7 +52,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 1; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 1; * @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) 104); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 8: { // 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 ddd8617..811e8eb 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 = 8; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_info = 5; */ private final PlayerDetailInfoOuterClass.PlayerDetailInfo playerDetailInfo = PlayerDetailInfoOuterClass.PlayerDetailInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 2; * @return this */ public GetPlayerDetailInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 2; * @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 = 5; * @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 = 5; * @return this */ public GetPlayerDetailInfoScRsp clearPlayerDetailInfo() { @@ -94,7 +94,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_info = 5; * @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) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 42); output.writeMessageNoTag(playerDetailInfo); } } @@ -227,16 +227,16 @@ public final class GetPlayerDetailInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 42) { break; } } - case 114: { + case 42: { // 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 c786c2d..1d95b47 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 sender_uid = 5; + * optional uint32 sender_uid = 1; */ private int senderUid; /** - * optional uint32 to_uid = 7; + * optional uint32 to_uid = 2; */ private int toUid; @@ -39,7 +39,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 1; * @return whether the senderUid field is set */ public boolean hasSenderUid() { @@ -47,7 +47,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 1; * @return this */ public GetPrivateChatHistoryCsReq clearSenderUid() { @@ -57,7 +57,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 1; * @return the senderUid */ public int getSenderUid() { @@ -65,7 +65,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 5; + * optional uint32 sender_uid = 1; * @param value the senderUid to set * @return this */ @@ -76,7 +76,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 7; + * optional uint32 to_uid = 2; * @return whether the toUid field is set */ public boolean hasToUid() { @@ -84,7 +84,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 7; + * optional uint32 to_uid = 2; * @return this */ public GetPrivateChatHistoryCsReq clearToUid() { @@ -94,7 +94,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 7; + * optional uint32 to_uid = 2; * @return the toUid */ public int getToUid() { @@ -102,7 +102,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 7; + * optional uint32 to_uid = 2; * @param value the toUid 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) 8); output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(toUid); } } @@ -205,16 +205,16 @@ public final class GetPrivateChatHistoryCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // senderUid senderUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 16) { break; } } - case 56: { + case 16: { // toUid toUid = 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 28729bb..3d7fd8d 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 to_uid = 2; - */ - private int toUid; - - /** - * optional uint32 retcode = 5; - */ - private int retcode; - - /** - * optional uint32 sender_uid = 11; + * optional uint32 sender_uid = 3; */ private int senderUid; /** - * repeated .Chat chat_list = 8; + * optional uint32 to_uid = 7; + */ + private int toUid; + + /** + * optional uint32 retcode = 15; + */ + private int retcode; + + /** + * repeated .Chat chat_list = 9; */ private final RepeatedMessage chatList = RepeatedMessage.newEmptyInstance(ChatOuterClass.Chat.getFactory()); @@ -50,99 +50,25 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 to_uid = 2; - * @return whether the toUid field is set + * optional uint32 sender_uid = 3; + * @return whether the senderUid field is set */ - public boolean hasToUid() { + public boolean hasSenderUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 to_uid = 2; - * @return this - */ - public GetPrivateChatHistoryScRsp clearToUid() { - bitField0_ &= ~0x00000001; - toUid = 0; - return this; - } - - /** - * optional uint32 to_uid = 2; - * @return the toUid - */ - public int getToUid() { - return toUid; - } - - /** - * optional uint32 to_uid = 2; - * @param value the toUid to set - * @return this - */ - public GetPrivateChatHistoryScRsp setToUid(final int value) { - bitField0_ |= 0x00000001; - toUid = 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 GetPrivateChatHistoryScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 5; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 5; - * @param value the retcode to set - * @return this - */ - public GetPrivateChatHistoryScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = value; - return this; - } - - /** - * optional uint32 sender_uid = 11; - * @return whether the senderUid field is set - */ - public boolean hasSenderUid() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 sender_uid = 11; + * optional uint32 sender_uid = 3; * @return this */ public GetPrivateChatHistoryScRsp clearSenderUid() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; senderUid = 0; return this; } /** - * optional uint32 sender_uid = 11; + * optional uint32 sender_uid = 3; * @return the senderUid */ public int getSenderUid() { @@ -150,18 +76,92 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 sender_uid = 11; + * optional uint32 sender_uid = 3; * @param value the senderUid to set * @return this */ public GetPrivateChatHistoryScRsp setSenderUid(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; senderUid = value; return this; } /** - * repeated .Chat chat_list = 8; + * optional uint32 to_uid = 7; + * @return whether the toUid field is set + */ + public boolean hasToUid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 to_uid = 7; + * @return this + */ + public GetPrivateChatHistoryScRsp clearToUid() { + bitField0_ &= ~0x00000002; + toUid = 0; + return this; + } + + /** + * optional uint32 to_uid = 7; + * @return the toUid + */ + public int getToUid() { + return toUid; + } + + /** + * optional uint32 to_uid = 7; + * @param value the toUid to set + * @return this + */ + public GetPrivateChatHistoryScRsp setToUid(final int value) { + bitField0_ |= 0x00000002; + toUid = 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; + * @return this + */ + public GetPrivateChatHistoryScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + 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 GetPrivateChatHistoryScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + /** + * repeated .Chat chat_list = 9; * @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 = 9; * @return this */ public GetPrivateChatHistoryScRsp clearChatList() { @@ -179,7 +179,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_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. @@ -193,7 +193,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_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 @@ -207,7 +207,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_list = 9; * @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 = 9; * @param values the chatList to add * @return this */ @@ -233,9 +233,9 @@ public final class GetPrivateChatHistoryScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + senderUid = other.senderUid; toUid = other.toUid; retcode = other.retcode; - senderUid = other.senderUid; chatList.copyFrom(other.chatList); } return this; @@ -247,15 +247,15 @@ public final class GetPrivateChatHistoryScRspOuterClass { return this; } cachedSize = -1; + if (other.hasSenderUid()) { + setSenderUid(other.senderUid); + } if (other.hasToUid()) { setToUid(other.toUid); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasSenderUid()) { - setSenderUid(other.senderUid); - } if (other.hasChatList()) { getMutableChatList().addAll(other.chatList); } @@ -269,9 +269,9 @@ public final class GetPrivateChatHistoryScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + senderUid = 0; toUid = 0; retcode = 0; - senderUid = 0; chatList.clear(); return this; } @@ -297,29 +297,29 @@ public final class GetPrivateChatHistoryScRspOuterClass { } GetPrivateChatHistoryScRsp other = (GetPrivateChatHistoryScRsp) o; return bitField0_ == other.bitField0_ + && (!hasSenderUid() || senderUid == other.senderUid) && (!hasToUid() || toUid == other.toUid) && (!hasRetcode() || retcode == other.retcode) - && (!hasSenderUid() || senderUid == other.senderUid) && (!hasChatList() || chatList.equals(other.chatList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(toUid); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(senderUid); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < chatList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 74); output.writeMessageNoTag(chatList.get(i)); } } @@ -329,13 +329,13 @@ public final class GetPrivateChatHistoryScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * chatList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chatList); @@ -350,34 +350,34 @@ public final class GetPrivateChatHistoryScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // toUid - toUid = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 24: { // senderUid senderUid = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 56) { break; } } - case 66: { + case 56: { + // toUid + toUid = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { // chatList tag = input.readRepeatedMessage(chatList, tag); bitField0_ |= 0x00000008; @@ -403,13 +403,13 @@ public final class GetPrivateChatHistoryScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.chatList, chatList); @@ -424,12 +424,24 @@ public final class GetPrivateChatHistoryScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { + if (!input.trySkipNullValue()) { + senderUid = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 110520277: case -868529012: { if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { toUid = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -440,18 +452,6 @@ public final class GetPrivateChatHistoryScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 32180699: - case 997911366: { - if (input.isAtField(FieldNames.senderUid)) { - if (!input.trySkipNullValue()) { - senderUid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -524,12 +524,12 @@ public final class GetPrivateChatHistoryScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); + static final FieldName toUid = FieldName.forField("toUid", "to_uid"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); - static final FieldName 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 55a647f..5d8e50a 100644 --- a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java @@ -20,7 +20,7 @@ public final class GetQuestDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 1; */ private int retcode; @@ -30,7 +30,7 @@ public final class GetQuestDataScRspOuterClass { private int totalAchievementExp; /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 13; */ private final RepeatedMessage questList = RepeatedMessage.newEmptyInstance(QuestOuterClass.Quest.getFactory()); @@ -45,7 +45,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 1; * @return this */ public GetQuestDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 13; * @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 = 13; * @return this */ public GetQuestDataScRsp clearQuestList() { @@ -137,7 +137,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_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 GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_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 GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 13; * @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 = 13; * @param values the questList to add * @return this */ @@ -258,7 +258,7 @@ public final class GetQuestDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -267,7 +267,7 @@ public final class GetQuestDataScRspOuterClass { } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < questList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 106); output.writeMessageNoTag(questList.get(i)); } } @@ -295,7 +295,7 @@ public final class GetQuestDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -309,11 +309,11 @@ public final class GetQuestDataScRspOuterClass { totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 106) { break; } } - case 82: { + case 106: { // questList tag = input.readRepeatedMessage(questList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java index 39de9e7..d2e6317 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 = 11; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .RogueBuffEnhanceShopInfo shop_info = 13; + * optional .RogueBuffEnhanceShopInfo shop_info = 8; */ private final RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo shopInfo = RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @return this */ public GetRogueBuffEnhanceInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 13; + * optional .RogueBuffEnhanceShopInfo shop_info = 8; * @return whether the shopInfo field is set */ public boolean hasShopInfo() { @@ -84,7 +84,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 13; + * optional .RogueBuffEnhanceShopInfo shop_info = 8; * @return this */ public GetRogueBuffEnhanceInfoScRsp clearShopInfo() { @@ -94,7 +94,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 13; + * optional .RogueBuffEnhanceShopInfo shop_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 GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 13; + * optional .RogueBuffEnhanceShopInfo shop_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 GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 13; + * optional .RogueBuffEnhanceShopInfo shop_info = 8; * @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) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 66); output.writeMessageNoTag(shopInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 66) { break; } } - case 106: { + case 66: { // 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 604439a..c272286 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 = 3; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .RogueHandbookData handbook_info = 10; + * optional .RogueHandbookData handbook_info = 7; */ private final RogueHandbookDataOuterClass.RogueHandbookData handbookInfo = RogueHandbookDataOuterClass.RogueHandbookData.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return this */ public GetRogueHandbookDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 10; + * optional .RogueHandbookData handbook_info = 7; * @return whether the handbookInfo field is set */ public boolean hasHandbookInfo() { @@ -84,7 +84,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 10; + * optional .RogueHandbookData handbook_info = 7; * @return this */ public GetRogueHandbookDataScRsp clearHandbookInfo() { @@ -94,7 +94,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 10; + * optional .RogueHandbookData handbook_info = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 10; + * optional .RogueHandbookData handbook_info = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 10; + * optional .RogueHandbookData handbook_info = 7; * @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) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 58); output.writeMessageNoTag(handbookInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueHandbookDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 58) { break; } } - case 82: { + case 58: { // 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 90d2663..2f90477 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java @@ -19,7 +19,7 @@ public final class GetRogueInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; */ private int retcode; @@ -39,7 +39,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return this */ public GetRogueInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -198,7 +198,7 @@ public final class GetRogueInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -226,7 +226,7 @@ public final class GetRogueInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java index f471b56..7ab6082 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 = 8; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_info = 7; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 8; + * 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 = 8; + * optional uint32 retcode = 9; * @return this */ public GetRogueInitialScoreScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 8; + * 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 = 7; * @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 = 7; * @return this */ public GetRogueInitialScoreScRsp clearRogueScoreInfo() { @@ -94,7 +94,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_info = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_info = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_info = 7; * @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) 64); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 58); output.writeMessageNoTag(rogueScoreInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueInitialScoreScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 58) { break; } } - case 74: { + case 58: { // 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 ad5e631..65272a2 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 = 14; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional .RogueScoreRewardInfo score_reward_info = 4; + * 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 = 14; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 4; * @return this */ public GetRogueScoreRewardInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 4; + * 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 = 4; + * optional .RogueScoreRewardInfo score_reward_info = 1; * @return this */ public GetRogueScoreRewardInfoScRsp clearScoreRewardInfo() { @@ -94,7 +94,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 4; + * 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 = 4; + * 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 = 4; + * 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) 112); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(scoreRewardInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + 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 1e34909..1b8edbd 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 = 5; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_info = 8; */ private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; * @return this */ public GetRogueTalentInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_info = 8; * @return whether the talentInfo field is set */ public boolean hasTalentInfo() { @@ -84,7 +84,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_info = 8; * @return this */ public GetRogueTalentInfoScRsp clearTalentInfo() { @@ -94,7 +94,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_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 GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_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 GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_info = 8; * @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) 40); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 66); output.writeMessageNoTag(talentInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueTalentInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 66) { break; } } - case 10: { + case 66: { // talentInfo input.readMessage(talentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java index b7844fb..8da7e0e 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class GetRollShopInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 roll_shop_id = 12; + * optional uint32 roll_shop_id = 7; */ private int rollShopId; @@ -34,7 +34,7 @@ public final class GetRollShopInfoCsReqOuterClass { } /** - * optional uint32 roll_shop_id = 12; + * optional uint32 roll_shop_id = 7; * @return whether the rollShopId field is set */ public boolean hasRollShopId() { @@ -42,7 +42,7 @@ public final class GetRollShopInfoCsReqOuterClass { } /** - * optional uint32 roll_shop_id = 12; + * optional uint32 roll_shop_id = 7; * @return this */ public GetRollShopInfoCsReq clearRollShopId() { @@ -52,7 +52,7 @@ public final class GetRollShopInfoCsReqOuterClass { } /** - * optional uint32 roll_shop_id = 12; + * optional uint32 roll_shop_id = 7; * @return the rollShopId */ public int getRollShopId() { @@ -60,7 +60,7 @@ public final class GetRollShopInfoCsReqOuterClass { } /** - * optional uint32 roll_shop_id = 12; + * optional uint32 roll_shop_id = 7; * @param value the rollShopId to set * @return this */ @@ -129,7 +129,7 @@ public final class GetRollShopInfoCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(rollShopId); } } @@ -150,7 +150,7 @@ public final class GetRollShopInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 56: { // rollShopId rollShopId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java index ef08765..02aaa88 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java @@ -19,27 +19,27 @@ public final class GetRollShopInfoScRspOuterClass { public static final class GetRollShopInfoScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 roll_shop_id = 4; - */ - private int rollShopId; - /** * 
      *  gacha_random
      *
* - * optional uint32 BBJIJINJAFK = 9; + * optional uint32 BBJIJINJAFK = 3; */ private int bBJIJINJAFK; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated uint32 DLPBJMPECFC = 5; + * optional uint32 roll_shop_id = 15; + */ + private int rollShopId; + + /** + * repeated uint32 DLPBJMPECFC = 11; */ private final RepeatedInt dLPBJMPECFC = RepeatedInt.newEmptyInstance(); @@ -54,64 +54,27 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 roll_shop_id = 4; - * @return whether the rollShopId field is set + * 
+     *  gacha_random
+     *
+ * + * optional uint32 BBJIJINJAFK = 3; + * @return whether the bBJIJINJAFK field is set */ - public boolean hasRollShopId() { + public boolean hasBBJIJINJAFK() { return (bitField0_ & 0x00000001) != 0; } - /** - * optional uint32 roll_shop_id = 4; - * @return this - */ - public GetRollShopInfoScRsp clearRollShopId() { - bitField0_ &= ~0x00000001; - rollShopId = 0; - return this; - } - - /** - * optional uint32 roll_shop_id = 4; - * @return the rollShopId - */ - public int getRollShopId() { - return rollShopId; - } - - /** - * optional uint32 roll_shop_id = 4; - * @param value the rollShopId to set - * @return this - */ - public GetRollShopInfoScRsp setRollShopId(final int value) { - bitField0_ |= 0x00000001; - rollShopId = value; - return this; - } - /** * 
      *  gacha_random
      *
* - * optional uint32 BBJIJINJAFK = 9; - * @return whether the bBJIJINJAFK field is set - */ - public boolean hasBBJIJINJAFK() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     *  gacha_random
-     *
- * - * optional uint32 BBJIJINJAFK = 9; + * optional uint32 BBJIJINJAFK = 3; * @return this */ public GetRollShopInfoScRsp clearBBJIJINJAFK() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; bBJIJINJAFK = 0; return this; } @@ -121,7 +84,7 @@ public final class GetRollShopInfoScRspOuterClass { * gacha_random * * - * optional uint32 BBJIJINJAFK = 9; + * optional uint32 BBJIJINJAFK = 3; * @return the bBJIJINJAFK */ public int getBBJIJINJAFK() { @@ -133,36 +96,36 @@ public final class GetRollShopInfoScRspOuterClass { * gacha_random * * - * optional uint32 BBJIJINJAFK = 9; + * optional uint32 BBJIJINJAFK = 3; * @param value the bBJIJINJAFK to set * @return this */ public GetRollShopInfoScRsp setBBJIJINJAFK(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; bBJIJINJAFK = value; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; * @return this */ public GetRollShopInfoScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -170,18 +133,55 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ public GetRollShopInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * repeated uint32 DLPBJMPECFC = 5; + * optional uint32 roll_shop_id = 15; + * @return whether the rollShopId field is set + */ + public boolean hasRollShopId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 roll_shop_id = 15; + * @return this + */ + public GetRollShopInfoScRsp clearRollShopId() { + bitField0_ &= ~0x00000004; + rollShopId = 0; + return this; + } + + /** + * optional uint32 roll_shop_id = 15; + * @return the rollShopId + */ + public int getRollShopId() { + return rollShopId; + } + + /** + * optional uint32 roll_shop_id = 15; + * @param value the rollShopId to set + * @return this + */ + public GetRollShopInfoScRsp setRollShopId(final int value) { + bitField0_ |= 0x00000004; + rollShopId = value; + return this; + } + + /** + * repeated uint32 DLPBJMPECFC = 11; * @return whether the dLPBJMPECFC field is set */ public boolean hasDLPBJMPECFC() { @@ -189,7 +189,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 5; + * repeated uint32 DLPBJMPECFC = 11; * @return this */ public GetRollShopInfoScRsp clearDLPBJMPECFC() { @@ -199,7 +199,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 5; + * repeated uint32 DLPBJMPECFC = 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. @@ -213,7 +213,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 5; + * repeated uint32 DLPBJMPECFC = 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 @@ -227,7 +227,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 5; + * repeated uint32 DLPBJMPECFC = 11; * @param value the dLPBJMPECFC to add * @return this */ @@ -238,7 +238,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 5; + * repeated uint32 DLPBJMPECFC = 11; * @param values the dLPBJMPECFC to add * @return this */ @@ -253,9 +253,9 @@ public final class GetRollShopInfoScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rollShopId = other.rollShopId; bBJIJINJAFK = other.bBJIJINJAFK; retcode = other.retcode; + rollShopId = other.rollShopId; dLPBJMPECFC.copyFrom(other.dLPBJMPECFC); } return this; @@ -267,15 +267,15 @@ public final class GetRollShopInfoScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRollShopId()) { - setRollShopId(other.rollShopId); - } if (other.hasBBJIJINJAFK()) { setBBJIJINJAFK(other.bBJIJINJAFK); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasRollShopId()) { + setRollShopId(other.rollShopId); + } if (other.hasDLPBJMPECFC()) { getMutableDLPBJMPECFC().addAll(other.dLPBJMPECFC); } @@ -289,9 +289,9 @@ public final class GetRollShopInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - rollShopId = 0; bBJIJINJAFK = 0; retcode = 0; + rollShopId = 0; dLPBJMPECFC.clear(); return this; } @@ -317,29 +317,29 @@ public final class GetRollShopInfoScRspOuterClass { } GetRollShopInfoScRsp other = (GetRollShopInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRollShopId() || rollShopId == other.rollShopId) && (!hasBBJIJINJAFK() || bBJIJINJAFK == other.bBJIJINJAFK) && (!hasRetcode() || retcode == other.retcode) + && (!hasRollShopId() || rollShopId == other.rollShopId) && (!hasDLPBJMPECFC() || dLPBJMPECFC.equals(other.dLPBJMPECFC)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(rollShopId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(bBJIJINJAFK); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(rollShopId); + } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < dLPBJMPECFC.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(dLPBJMPECFC.array()[i]); } } @@ -349,14 +349,14 @@ public final class GetRollShopInfoScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(bBJIJINJAFK); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId); + } if ((bitField0_ & 0x00000008) != 0) { size += (1 * dLPBJMPECFC.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dLPBJMPECFC); } @@ -370,34 +370,34 @@ public final class GetRollShopInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // rollShopId - rollShopId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 24: { // bBJIJINJAFK bBJIJINJAFK = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 64) { break; } } - case 104: { + case 64: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 120) { break; } } - case 42: { + case 120: { + // rollShopId + rollShopId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // dLPBJMPECFC [packed=true] input.readPackedUInt32(dLPBJMPECFC, tag); bitField0_ |= 0x00000008; @@ -416,7 +416,7 @@ public final class GetRollShopInfoScRspOuterClass { tag = input.readTag(); break; } - case 40: { + case 88: { // dLPBJMPECFC [packed=false] tag = input.readRepeatedUInt32(dLPBJMPECFC, tag); bitField0_ |= 0x00000008; @@ -430,14 +430,14 @@ public final class GetRollShopInfoScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rollShopId, rollShopId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.bBJIJINJAFK, bBJIJINJAFK); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.rollShopId, rollShopId); + } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedUInt32(FieldNames.dLPBJMPECFC, dLPBJMPECFC); } @@ -451,23 +451,11 @@ public final class GetRollShopInfoScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -904898162: - case -1612413630: { - if (input.isAtField(FieldNames.rollShopId)) { - if (!input.trySkipNullValue()) { - rollShopId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1536175796: { if (input.isAtField(FieldNames.bBJIJINJAFK)) { if (!input.trySkipNullValue()) { bBJIJINJAFK = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -478,6 +466,18 @@ public final class GetRollShopInfoScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -904898162: + case -1612413630: { + if (input.isAtField(FieldNames.rollShopId)) { + if (!input.trySkipNullValue()) { + rollShopId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -549,12 +549,12 @@ public final class GetRollShopInfoScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id"); - static final FieldName bBJIJINJAFK = FieldName.forField("BBJIJINJAFK"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id"); + static final FieldName dLPBJMPECFC = FieldName.forField("DLPBJMPECFC"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java index b838f9f..ed665f1 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class GetSceneMapInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 1; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 1; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -43,7 +43,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 1; * @return this */ public GetSceneMapInfoCsReq clearEntryIdList() { @@ -53,7 +53,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_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 GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_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 GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 1; * @param value the entryIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 1; * @param values the entryIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class GetSceneMapInfoCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetSceneMapInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 10: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetSceneMapInfoCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 8: { // entryIdList [packed=false] tag = input.readRepeatedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java index 3413290..7b2ade6 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetSceneMapInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; */ private int retcode; /** - * repeated .MazeMapData map_list = 1; + * repeated .MazeMapData map_list = 5; */ private final RepeatedMessage mapList = RepeatedMessage.newEmptyInstance(MazeMapDataOuterClass.MazeMapData.getFactory()); @@ -40,7 +40,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return this */ public GetSceneMapInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 1; + * repeated .MazeMapData map_list = 5; * @return whether the mapList field is set */ public boolean hasMapList() { @@ -85,7 +85,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 1; + * repeated .MazeMapData map_list = 5; * @return this */ public GetSceneMapInfoScRsp clearMapList() { @@ -95,7 +95,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 1; + * repeated .MazeMapData map_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 GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 1; + * repeated .MazeMapData map_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 GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 1; + * repeated .MazeMapData map_list = 5; * @param value the mapList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 1; + * repeated .MazeMapData map_list = 5; * @param values the mapList to add * @return this */ @@ -210,12 +210,12 @@ public final class GetSceneMapInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < mapList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 42); output.writeMessageNoTag(mapList.get(i)); } } @@ -240,16 +240,16 @@ public final class GetSceneMapInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { + case 42: { // mapList tag = input.readRepeatedMessage(mapList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java index 2fe81c7..e961ed5 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 = 8; + * optional uint32 shop_type = 13; */ private int shopType; @@ -34,7 +34,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 8; + * optional uint32 shop_type = 13; * @return whether the shopType field is set */ public boolean hasShopType() { @@ -42,7 +42,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 8; + * optional uint32 shop_type = 13; * @return this */ public GetShopListCsReq clearShopType() { @@ -52,7 +52,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 8; + * optional uint32 shop_type = 13; * @return the shopType */ public int getShopType() { @@ -60,7 +60,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 8; + * optional uint32 shop_type = 13; * @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) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(shopType); } } @@ -150,7 +150,7 @@ public final class GetShopListCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 104: { // 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 75eddbf..edb555d 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 = 4; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 shop_type = 11; + * optional uint32 shop_type = 13; */ private int shopType; /** - * repeated .Shop shop_list = 9; + * repeated .Shop shop_list = 15; */ private final RepeatedMessage shopList = RepeatedMessage.newEmptyInstance(ShopOuterClass.Shop.getFactory()); @@ -45,7 +45,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 3; * @return this */ public GetShopListScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 11; + * optional uint32 shop_type = 13; * @return whether the shopType field is set */ public boolean hasShopType() { @@ -90,7 +90,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 11; + * optional uint32 shop_type = 13; * @return this */ public GetShopListScRsp clearShopType() { @@ -100,7 +100,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 11; + * optional uint32 shop_type = 13; * @return the shopType */ public int getShopType() { @@ -108,7 +108,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 11; + * optional uint32 shop_type = 13; * @param value the shopType to set * @return this */ @@ -119,7 +119,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 9; + * repeated .Shop shop_list = 15; * @return whether the shopList field is set */ public boolean hasShopList() { @@ -127,7 +127,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 9; + * repeated .Shop shop_list = 15; * @return this */ public GetShopListScRsp clearShopList() { @@ -137,7 +137,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 9; + * repeated .Shop shop_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 GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 9; + * repeated .Shop shop_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 GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 9; + * repeated .Shop shop_list = 15; * @param value the shopList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 9; + * repeated .Shop shop_list = 15; * @param values the shopList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetShopListScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(shopType); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < shopList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeMessageNoTag(shopList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetShopListScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { + case 104: { // shopType shopType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 122) { break; } } - case 74: { + case 122: { // shopList tag = input.readRepeatedMessage(shopList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java index 8b7cf69..ee0b4f4 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 = 5; + * repeated uint32 entry_id_list = 12; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 5; + * repeated uint32 entry_id_list = 12; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -43,7 +43,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 5; + * repeated uint32 entry_id_list = 12; * @return this */ public GetUnlockTeleportCsReq clearEntryIdList() { @@ -53,7 +53,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 5; + * repeated uint32 entry_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 GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 5; + * repeated uint32 entry_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 GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 5; + * repeated uint32 entry_id_list = 12; * @param value the entryIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 5; + * repeated uint32 entry_id_list = 12; * @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) 40); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetUnlockTeleportCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 98: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetUnlockTeleportCsReqOuterClass { tag = input.readTag(); break; } - case 40: { + case 96: { // 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 c211a6b..30c364f 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 = 15; + * optional uint32 retcode = 9; */ private int retcode; /** - * repeated uint32 unlocked_teleport_list = 9; + * repeated uint32 unlocked_teleport_list = 5; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * 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 GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return this */ public GetUnlockTeleportScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 9; + * repeated uint32 unlocked_teleport_list = 5; * @return whether the unlockedTeleportList field is set */ public boolean hasUnlockedTeleportList() { @@ -85,7 +85,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 9; + * repeated uint32 unlocked_teleport_list = 5; * @return this */ public GetUnlockTeleportScRsp clearUnlockedTeleportList() { @@ -95,7 +95,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 9; + * repeated uint32 unlocked_teleport_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 GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 9; + * repeated uint32 unlocked_teleport_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 GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 9; + * repeated uint32 unlocked_teleport_list = 5; * @param value the unlockedTeleportList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 9; + * repeated uint32 unlocked_teleport_list = 5; * @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) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetUnlockTeleportScRspOuterClass { 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 != 42) { break; } } - case 74: { + case 42: { // unlockedTeleportList [packed=true] input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetUnlockTeleportScRspOuterClass { tag = input.readTag(); break; } - case 72: { + case 40: { // 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 936dc38..9c85bef 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 = 11; - */ - private long beginTime; - - /** - * optional int64 end_time = 14; + * optional int64 end_time = 3; */ private long endTime; /** - * optional uint32 buy_times = 6; + * optional int64 begin_time = 14; + */ + private long beginTime; + + /** + * optional uint32 buy_times = 11; */ private int buyTimes; /** - * optional uint32 goods_id = 8; + * optional uint32 goods_id = 13; */ private int goodsId; /** - * optional uint32 item_id = 9; + * optional uint32 item_id = 15; */ private int itemId; @@ -54,62 +54,25 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 11; - * @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 = 11; - * @return this - */ - public Goods clearBeginTime() { - bitField0_ &= ~0x00000001; - 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 Goods setBeginTime(final long value) { - bitField0_ |= 0x00000001; - beginTime = value; - return this; - } - - /** - * optional int64 end_time = 14; - * @return whether the endTime field is set - */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 14; + * optional int64 end_time = 3; * @return this */ public Goods clearEndTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; endTime = 0L; return this; } /** - * optional int64 end_time = 14; + * optional int64 end_time = 3; * @return the endTime */ public long getEndTime() { @@ -117,18 +80,55 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 14; + * optional int64 end_time = 3; * @param value the endTime to set * @return this */ public Goods setEndTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; endTime = value; return this; } /** - * optional uint32 buy_times = 6; + * optional int64 begin_time = 14; + * @return whether the beginTime field is set + */ + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 begin_time = 14; + * @return this + */ + public Goods clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * optional int64 begin_time = 14; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * optional int64 begin_time = 14; + * @param value the beginTime to set + * @return this + */ + public Goods setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 buy_times = 11; * @return whether the buyTimes field is set */ public boolean hasBuyTimes() { @@ -136,7 +136,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 6; + * optional uint32 buy_times = 11; * @return this */ public Goods clearBuyTimes() { @@ -146,7 +146,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 6; + * optional uint32 buy_times = 11; * @return the buyTimes */ public int getBuyTimes() { @@ -154,7 +154,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 6; + * optional uint32 buy_times = 11; * @param value the buyTimes to set * @return this */ @@ -165,7 +165,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 goods_id = 8; + * optional uint32 goods_id = 13; * @return whether the goodsId field is set */ public boolean hasGoodsId() { @@ -173,7 +173,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 goods_id = 8; + * optional uint32 goods_id = 13; * @return this */ public Goods clearGoodsId() { @@ -183,7 +183,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 goods_id = 8; + * optional uint32 goods_id = 13; * @return the goodsId */ public int getGoodsId() { @@ -191,7 +191,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 goods_id = 8; + * optional uint32 goods_id = 13; * @param value the goodsId to set * @return this */ @@ -202,7 +202,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 item_id = 9; + * optional uint32 item_id = 15; * @return whether the itemId field is set */ public boolean hasItemId() { @@ -210,7 +210,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 item_id = 9; + * optional uint32 item_id = 15; * @return this */ public Goods clearItemId() { @@ -220,7 +220,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 item_id = 9; + * optional uint32 item_id = 15; * @return the itemId */ public int getItemId() { @@ -228,7 +228,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 item_id = 9; + * optional uint32 item_id = 15; * @param value the itemId to set * @return this */ @@ -243,8 +243,8 @@ public final class GoodsOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; + beginTime = other.beginTime; buyTimes = other.buyTimes; goodsId = other.goodsId; itemId = other.itemId; @@ -258,12 +258,12 @@ public final class GoodsOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasBuyTimes()) { setBuyTimes(other.buyTimes); } @@ -283,8 +283,8 @@ public final class GoodsOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; + beginTime = 0L; buyTimes = 0; goodsId = 0; itemId = 0; @@ -311,8 +311,8 @@ public final class GoodsOuterClass { } Goods other = (Goods) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasBuyTimes() || buyTimes == other.buyTimes) && (!hasGoodsId() || goodsId == other.goodsId) && (!hasItemId() || itemId == other.itemId); @@ -321,23 +321,23 @@ public final class GoodsOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeInt64NoTag(beginTime); + output.writeRawByte((byte) 24); + output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 112); - output.writeInt64NoTag(endTime); + output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(buyTimes); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(itemId); } } @@ -346,10 +346,10 @@ public final class GoodsOuterClass { 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(buyTimes); @@ -370,9 +370,9 @@ public final class GoodsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // beginTime - beginTime = input.readInt64(); + case 24: { + // endTime + endTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 112) { @@ -380,33 +380,33 @@ public final class GoodsOuterClass { } } case 112: { - // endTime - endTime = input.readInt64(); + // beginTime + beginTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 88) { break; } } - case 48: { + case 88: { // buyTimes buyTimes = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { + case 104: { // goodsId goodsId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 72) { + if (tag != 120) { break; } } - case 72: { + case 120: { // itemId itemId = input.readUInt32(); bitField0_ |= 0x00000010; @@ -433,10 +433,10 @@ public final class GoodsOuterClass { 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.buyTimes, buyTimes); @@ -457,11 +457,11 @@ public final class GoodsOuterClass { } 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 { @@ -469,11 +469,11 @@ public final class GoodsOuterClass { } 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 { @@ -569,10 +569,10 @@ public final class GoodsOuterClass { * 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 buyTimes = FieldName.forField("buyTimes", "buy_times"); static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java index 5bee085..e69eb03 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class GroupStateChangeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .GroupStateInfo group_info = 7; + * optional .GroupStateInfo group_info = 8; */ private final GroupStateInfoOuterClass.GroupStateInfo groupInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 7; + * optional .GroupStateInfo group_info = 8; * @return whether the groupInfo field is set */ public boolean hasGroupInfo() { @@ -42,7 +42,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 7; + * optional .GroupStateInfo group_info = 8; * @return this */ public GroupStateChangeCsReq clearGroupInfo() { @@ -52,7 +52,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 7; + * optional .GroupStateInfo group_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 GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 7; + * optional .GroupStateInfo group_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 GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 7; + * optional .GroupStateInfo group_info = 8; * @param value the groupInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class GroupStateChangeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 66); output.writeMessageNoTag(groupInfo); } } @@ -171,7 +171,7 @@ public final class GroupStateChangeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 66: { // groupInfo input.readMessage(groupInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java index bdd29e7..0a7534a 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 = 8; + * optional .GroupStateInfo group_state_info = 9; */ private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 9; * @return whether the groupStateInfo field is set */ public boolean hasGroupStateInfo() { @@ -42,7 +42,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 9; * @return this */ public GroupStateChangeScNotify clearGroupStateInfo() { @@ -52,7 +52,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_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 GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_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 GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 9; * @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) 66); + output.writeRawByte((byte) 74); output.writeMessageNoTag(groupStateInfo); } } @@ -172,7 +172,7 @@ public final class GroupStateChangeScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 74: { // 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 0fb0a9d..48397bb 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GroupStateChangeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .GroupStateInfo group_info = 3; + * optional .GroupStateInfo group_info = 11; */ private final GroupStateInfoOuterClass.GroupStateInfo groupInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; * @return this */ public GroupStateChangeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 3; + * optional .GroupStateInfo group_info = 11; * @return whether the groupInfo field is set */ public boolean hasGroupInfo() { @@ -84,7 +84,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 3; + * optional .GroupStateInfo group_info = 11; * @return this */ public GroupStateChangeScRsp clearGroupInfo() { @@ -94,7 +94,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 3; + * optional .GroupStateInfo group_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. @@ -108,7 +108,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 3; + * optional .GroupStateInfo group_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 @@ -122,7 +122,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 3; + * optional .GroupStateInfo group_info = 11; * @param value the groupInfo to set * @return this */ @@ -198,11 +198,11 @@ public final class GroupStateChangeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 90); output.writeMessageNoTag(groupInfo); } } @@ -226,16 +226,16 @@ public final class GroupStateChangeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 90) { break; } } - case 26: { + case 90: { // 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 d58d24f..9ba6e0e 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java @@ -13,35 +13,43 @@ import us.hebi.quickbuf.ProtoSource; public final class GroupStateInfoOuterClass { /** + * 
+   *  TODO: verify player_uid and group_state
+   *
+ * * Protobuf type {@code GroupStateInfo} */ public static final class GroupStateInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 5; - */ - private int entryId; - - /** - * optional uint32 player_uid = 7; - */ - private int playerUid; - - /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 1; */ private int groupId; /** - * optional uint32 group_state = 13; + * optional uint32 group_state = 3; */ private int groupState; + /** + * optional uint32 entry_id = 4; + */ + private int entryId; + + /** + * optional uint32 player_uid = 6; + */ + private int playerUid; + private GroupStateInfo() { } /** + * 
+     *  TODO: verify player_uid and group_state
+     *
+ * * @return a new empty instance of {@code GroupStateInfo} */ public static GroupStateInfo newInstance() { @@ -49,99 +57,25 @@ public final class GroupStateInfoOuterClass { } /** - * optional uint32 entry_id = 5; - * @return whether the entryId field is set + * optional uint32 group_id = 1; + * @return whether the groupId field is set */ - public boolean hasEntryId() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entry_id = 5; - * @return this - */ - public GroupStateInfo clearEntryId() { - bitField0_ &= ~0x00000001; - 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 GroupStateInfo setEntryId(final int value) { - bitField0_ |= 0x00000001; - entryId = value; - return this; - } - - /** - * optional uint32 player_uid = 7; - * @return whether the playerUid field is set - */ - public boolean hasPlayerUid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 player_uid = 7; - * @return this - */ - public GroupStateInfo clearPlayerUid() { - bitField0_ &= ~0x00000002; - playerUid = 0; - return this; - } - - /** - * optional uint32 player_uid = 7; - * @return the playerUid - */ - public int getPlayerUid() { - return playerUid; - } - - /** - * optional uint32 player_uid = 7; - * @param value the playerUid to set - * @return this - */ - public GroupStateInfo setPlayerUid(final int value) { - bitField0_ |= 0x00000002; - playerUid = value; - return this; - } - - /** - * optional uint32 group_id = 8; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 1; * @return this */ public GroupStateInfo clearGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 1; * @return the groupId */ public int getGroupId() { @@ -149,36 +83,36 @@ public final class GroupStateInfoOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 1; * @param value the groupId to set * @return this */ public GroupStateInfo setGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; groupId = value; return this; } /** - * optional uint32 group_state = 13; + * optional uint32 group_state = 3; * @return whether the groupState field is set */ public boolean hasGroupState() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 group_state = 13; + * optional uint32 group_state = 3; * @return this */ public GroupStateInfo clearGroupState() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; groupState = 0; return this; } /** - * optional uint32 group_state = 13; + * optional uint32 group_state = 3; * @return the groupState */ public int getGroupState() { @@ -186,25 +120,99 @@ public final class GroupStateInfoOuterClass { } /** - * optional uint32 group_state = 13; + * optional uint32 group_state = 3; * @param value the groupState to set * @return this */ public GroupStateInfo setGroupState(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; 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 player_uid = 6; + * @return whether the playerUid field is set + */ + public boolean hasPlayerUid() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 player_uid = 6; + * @return this + */ + public GroupStateInfo clearPlayerUid() { + bitField0_ &= ~0x00000008; + playerUid = 0; + return this; + } + + /** + * optional uint32 player_uid = 6; + * @return the playerUid + */ + public int getPlayerUid() { + return playerUid; + } + + /** + * optional uint32 player_uid = 6; + * @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_; - entryId = other.entryId; - playerUid = other.playerUid; groupId = other.groupId; groupState = other.groupState; + entryId = other.entryId; + playerUid = other.playerUid; } return this; } @@ -215,18 +223,18 @@ public final class GroupStateInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEntryId()) { - setEntryId(other.entryId); - } - if (other.hasPlayerUid()) { - setPlayerUid(other.playerUid); - } if (other.hasGroupId()) { setGroupId(other.groupId); } if (other.hasGroupState()) { setGroupState(other.groupState); } + if (other.hasEntryId()) { + setEntryId(other.entryId); + } + if (other.hasPlayerUid()) { + setPlayerUid(other.playerUid); + } return this; } @@ -237,10 +245,10 @@ public final class GroupStateInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - entryId = 0; - playerUid = 0; groupId = 0; groupState = 0; + entryId = 0; + playerUid = 0; return this; } @@ -264,47 +272,47 @@ public final class GroupStateInfoOuterClass { } GroupStateInfo other = (GroupStateInfo) o; return bitField0_ == other.bitField0_ - && (!hasEntryId() || entryId == other.entryId) - && (!hasPlayerUid() || playerUid == other.playerUid) && (!hasGroupId() || groupId == other.groupId) - && (!hasGroupState() || groupState == other.groupState); + && (!hasGroupState() || groupState == other.groupState) + && (!hasEntryId() || entryId == other.entryId) + && (!hasPlayerUid() || playerUid == other.playerUid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(entryId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(playerUid); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(groupId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); output.writeUInt32NoTag(groupState); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(entryId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(playerUid); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(playerUid); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(playerUid); + } return size; } @@ -315,36 +323,36 @@ public final class GroupStateInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // playerUid - playerUid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 8: { // groupId groupId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 24) { break; } } - case 104: { + case 24: { // groupState groupState = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // playerUid + playerUid = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,17 +377,17 @@ public final class GroupStateInfoOuterClass { 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.playerUid, playerUid); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.groupId, groupId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.groupState, groupState); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.playerUid, playerUid); + } output.endObject(); } @@ -390,36 +398,12 @@ public final class GroupStateInfoOuterClass { } 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 -1872053841: - case 2096182770: { - if (input.isAtField(FieldNames.playerUid)) { - if (!input.trySkipNullValue()) { - playerUid = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 293428218: case 506361563: { if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { groupId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -431,6 +415,30 @@ public final class GroupStateInfoOuterClass { if (input.isAtField(FieldNames.groupState)) { if (!input.trySkipNullValue()) { groupState = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { + if (!input.trySkipNullValue()) { + entryId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1872053841: + case 2096182770: { + if (input.isAtField(FieldNames.playerUid)) { + if (!input.trySkipNullValue()) { + playerUid = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -491,13 +499,13 @@ public final class GroupStateInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - - static final FieldName playerUid = FieldName.forField("playerUid", "player_uid"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); static final FieldName groupState = FieldName.forField("groupState", "group_state"); + + static final FieldName entryId = FieldName.forField("entryId", "entry_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 82e359e..2058e26 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 = 6; + * optional uint32 uid = 11; */ private int uid; /** - * optional bool handle_result = 15; + * optional bool handle_result = 12; */ private boolean handleResult; @@ -39,7 +39,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 11; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 11; * @return this */ public HandleFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 11; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 11; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 15; + * 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 = 15; + * optional bool handle_result = 12; * @return this */ public HandleFriendCsReq clearHandleResult() { @@ -94,7 +94,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 15; + * optional bool handle_result = 12; * @return the handleResult */ public boolean getHandleResult() { @@ -102,7 +102,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 15; + * 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) 48); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeBoolNoTag(handleResult); } } @@ -205,16 +205,16 @@ public final class HandleFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 88: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + 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 afbdc09..918cbc5 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 = 3; - */ - private int uid; - - /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional bool handle_result = 9; + * optional uint32 uid = 7; + */ + private int uid; + + /** + * optional bool handle_result = 11; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 11; + * optional .FriendListInfo handle_friend_info = 6; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -49,62 +49,25 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 3; - * @return whether the uid field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasUid() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 uid = 3; - * @return this - */ - public HandleFriendScRsp clearUid() { - bitField0_ &= ~0x00000001; - uid = 0; - return this; - } - - /** - * optional uint32 uid = 3; - * @return the uid - */ - public int getUid() { - return uid; - } - - /** - * optional uint32 uid = 3; - * @param value the uid to set - * @return this - */ - public HandleFriendScRsp setUid(final int value) { - bitField0_ |= 0x00000001; - uid = 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 = 1; * @return this */ public HandleFriendScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -112,18 +75,55 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public HandleFriendScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional bool handle_result = 9; + * optional uint32 uid = 7; + * @return whether the uid field is set + */ + public boolean hasUid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 uid = 7; + * @return this + */ + public HandleFriendScRsp clearUid() { + bitField0_ &= ~0x00000002; + uid = 0; + return this; + } + + /** + * optional uint32 uid = 7; + * @return the uid + */ + public int getUid() { + return uid; + } + + /** + * optional uint32 uid = 7; + * @param value the uid to set + * @return this + */ + public HandleFriendScRsp setUid(final int value) { + bitField0_ |= 0x00000002; + uid = value; + return this; + } + + /** + * optional bool handle_result = 11; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -131,7 +131,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 9; + * optional bool handle_result = 11; * @return this */ public HandleFriendScRsp clearHandleResult() { @@ -141,7 +141,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 9; + * optional bool handle_result = 11; * @return the handleResult */ public boolean getHandleResult() { @@ -149,7 +149,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 9; + * optional bool handle_result = 11; * @param value the handleResult to set * @return this */ @@ -160,7 +160,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 11; + * optional .FriendListInfo handle_friend_info = 6; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -168,7 +168,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 11; + * optional .FriendListInfo handle_friend_info = 6; * @return this */ public HandleFriendScRsp clearHandleFriendInfo() { @@ -178,7 +178,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 11; + * optional .FriendListInfo handle_friend_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 11; + * optional .FriendListInfo handle_friend_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 11; + * optional .FriendListInfo handle_friend_info = 6; * @param value the handleFriendInfo to set * @return this */ @@ -222,8 +222,8 @@ public final class HandleFriendScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - uid = other.uid; retcode = other.retcode; + uid = other.uid; handleResult = other.handleResult; handleFriendInfo.copyFrom(other.handleFriendInfo); } @@ -236,12 +236,12 @@ public final class HandleFriendScRspOuterClass { return this; } cachedSize = -1; - if (other.hasUid()) { - setUid(other.uid); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasUid()) { + setUid(other.uid); + } if (other.hasHandleResult()) { setHandleResult(other.handleResult); } @@ -258,8 +258,8 @@ public final class HandleFriendScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - uid = 0; retcode = 0; + uid = 0; handleResult = false; handleFriendInfo.clear(); return this; @@ -286,8 +286,8 @@ public final class HandleFriendScRspOuterClass { } HandleFriendScRsp other = (HandleFriendScRsp) o; return bitField0_ == other.bitField0_ - && (!hasUid() || uid == other.uid) && (!hasRetcode() || retcode == other.retcode) + && (!hasUid() || uid == other.uid) && (!hasHandleResult() || handleResult == other.handleResult) && (!hasHandleFriendInfo() || handleFriendInfo.equals(other.handleFriendInfo)); } @@ -295,19 +295,19 @@ public final class HandleFriendScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(uid); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(uid); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 50); output.writeMessageNoTag(handleFriendInfo); } } @@ -316,10 +316,10 @@ public final class HandleFriendScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -337,34 +337,34 @@ public final class HandleFriendScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // uid - uid = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 8: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { + case 56: { + // uid + uid = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 90) { + if (tag != 50) { break; } } - case 90: { + case 50: { // handleFriendInfo input.readMessage(handleFriendInfo); bitField0_ |= 0x00000008; @@ -391,10 +391,10 @@ public final class HandleFriendScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.handleResult, handleResult); @@ -412,10 +412,10 @@ public final class HandleFriendScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -423,10 +423,10 @@ public final class HandleFriendScRspOuterClass { } 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 { @@ -511,10 +511,10 @@ public final class HandleFriendScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName uid = FieldName.forField("uid"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName uid = FieldName.forField("uid"); + static final FieldName handleResult = FieldName.forField("handleResult", "handle_result"); static final FieldName handleFriendInfo = FieldName.forField("handleFriendInfo", "handle_friend_info"); diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java index f329845..f14cf4a 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java @@ -19,19 +19,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueCommonBuffSelectResult buff_select_result = 309; + * optional .RogueCommonBuffSelectResult buff_select_result = 737; */ private final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult buffSelectResult = RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult.newInstance(); - /** - * 
-     *  could be 1134
-     *
- * - * optional .RogueBuffRollInfo roll_buff = 1008; - */ - private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance(); - /** * 
      *  check as well
@@ -50,6 +41,15 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
      */
     private final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult miracleSelectResult = RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult.newInstance();
 
+    /**
+     * 
+     *  could be 1349
+     * 

+     *
+     * optional .RogueBuffRollInfo roll_buff = 1753;
+     */
+    private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance();
+
     private HandleRogueCommonPendingActionCsReq() {
     }
 
@@ -67,47 +67,47 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
     public HandleRogueCommonPendingActionCsReq clearPendingAction() {
       if (hasPendingAction()) {
         clearBuffSelectResult();
-        clearRollBuff();
         clearBonusSelectResult();
         clearMiracleSelectResult();
+        clearRollBuff();
       }
       return this;
     }
 
     private void clearPendingActionOtherBuffSelectResult() {
       if ((((bitField0_ & 0x0000000e)) != 0)) {
+        clearBonusSelectResult();
+        clearMiracleSelectResult();
         clearRollBuff();
-        clearBonusSelectResult();
-        clearMiracleSelectResult();
-      }
-    }
-
-    private void clearPendingActionOtherRollBuff() {
-      if ((((bitField0_ & 0x0000000d)) != 0)) {
-        clearBuffSelectResult();
-        clearBonusSelectResult();
-        clearMiracleSelectResult();
       }
     }
 
     private void clearPendingActionOtherBonusSelectResult() {
-      if ((((bitField0_ & 0x0000000b)) != 0)) {
+      if ((((bitField0_ & 0x0000000d)) != 0)) {
         clearBuffSelectResult();
-        clearRollBuff();
         clearMiracleSelectResult();
+        clearRollBuff();
       }
     }
 
     private void clearPendingActionOtherMiracleSelectResult() {
+      if ((((bitField0_ & 0x0000000b)) != 0)) {
+        clearBuffSelectResult();
+        clearBonusSelectResult();
+        clearRollBuff();
+      }
+    }
+
+    private void clearPendingActionOtherRollBuff() {
       if ((((bitField0_ & 0x00000007)) != 0)) {
         clearBuffSelectResult();
-        clearRollBuff();
         clearBonusSelectResult();
+        clearMiracleSelectResult();
       }
     }
 
     /**
-     * optional .RogueCommonBuffSelectResult buff_select_result = 309;
+     * optional .RogueCommonBuffSelectResult buff_select_result = 737;
      * @return whether the buffSelectResult field is set
      */
     public boolean hasBuffSelectResult() {
@@ -115,7 +115,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
     }
 
     /**
-     * optional .RogueCommonBuffSelectResult buff_select_result = 309;
+     * optional .RogueCommonBuffSelectResult buff_select_result = 737;
      * @return this
      */
     public HandleRogueCommonPendingActionCsReq clearBuffSelectResult() {
@@ -125,7 +125,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
     }
 
     /**
-     * optional .RogueCommonBuffSelectResult buff_select_result = 309;
+     * optional .RogueCommonBuffSelectResult buff_select_result = 737;
      *
      * This 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 HandleRogueCommonPendingActionCsReqOuterClass {
     }
 
     /**
-     * optional .RogueCommonBuffSelectResult buff_select_result = 309;
+     * optional .RogueCommonBuffSelectResult buff_select_result = 737;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -155,7 +155,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
     }
 
     /**
-     * optional .RogueCommonBuffSelectResult buff_select_result = 309;
+     * optional .RogueCommonBuffSelectResult buff_select_result = 737;
      * @param value the buffSelectResult to set
      * @return this
      */
@@ -167,86 +167,6 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
       return this;
     }
 
-    /**
-     * 
-     *  could be 1134
-     * 

-     *
-     * optional .RogueBuffRollInfo roll_buff = 1008;
-     * @return whether the rollBuff field is set
-     */
-    public boolean hasRollBuff() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * 
-     *  could be 1134
-     * 

-     *
-     * optional .RogueBuffRollInfo roll_buff = 1008;
-     * @return this
-     */
-    public HandleRogueCommonPendingActionCsReq clearRollBuff() {
-      bitField0_ &= ~0x00000002;
-      rollBuff.clear();
-      return this;
-    }
-
-    /**
-     * 
-     *  could be 1134
-     * 

-     *
-     * optional .RogueBuffRollInfo roll_buff = 1008;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableRollBuff()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getRollBuff() {
-      return rollBuff;
-    }
-
-    /**
-     * 
-     *  could be 1134
-     * 

-     *
-     * optional .RogueBuffRollInfo roll_buff = 1008;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getMutableRollBuff() {
-      clearPendingActionOtherRollBuff();
-      bitField0_ |= 0x00000002;
-      return rollBuff;
-    }
-
-    /**
-     * 
-     *  could be 1134
-     * 

-     *
-     * optional .RogueBuffRollInfo roll_buff = 1008;
-     * @param value the rollBuff to set
-     * @return this
-     */
-    public HandleRogueCommonPendingActionCsReq setRollBuff(
-        final RogueBuffRollInfoOuterClass.RogueBuffRollInfo value) {
-      clearPendingActionOtherRollBuff();
-      bitField0_ |= 0x00000002;
-      rollBuff.copyFrom(value);
-      return this;
-    }
-
     /**
      * 
      *  check as well
@@ -256,7 +176,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
      * @return whether the bonusSelectResult field is set
      */
     public boolean hasBonusSelectResult() {
-      return (bitField0_ & 0x00000004) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
@@ -268,7 +188,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
      * @return this
      */
     public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       bonusSelectResult.clear();
       return this;
     }
@@ -306,7 +226,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
      */
     public RogueBonusSelectResultOuterClass.RogueBonusSelectResult getMutableBonusSelectResult() {
       clearPendingActionOtherBonusSelectResult();
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       return bonusSelectResult;
     }
 
@@ -322,7 +242,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
     public HandleRogueCommonPendingActionCsReq setBonusSelectResult(
         final RogueBonusSelectResultOuterClass.RogueBonusSelectResult value) {
       clearPendingActionOtherBonusSelectResult();
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       bonusSelectResult.copyFrom(value);
       return this;
     }
@@ -336,7 +256,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
      * @return whether the miracleSelectResult field is set
      */
     public boolean hasMiracleSelectResult() {
-      return (bitField0_ & 0x00000008) != 0;
+      return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
@@ -348,7 +268,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
      * @return this
      */
     public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() {
-      bitField0_ &= ~0x00000008;
+      bitField0_ &= ~0x00000004;
       miracleSelectResult.clear();
       return this;
     }
@@ -387,7 +307,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
     public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMutableMiracleSelectResult(
         ) {
       clearPendingActionOtherMiracleSelectResult();
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       return miracleSelectResult;
     }
 
@@ -403,11 +323,91 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
     public HandleRogueCommonPendingActionCsReq setMiracleSelectResult(
         final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult value) {
       clearPendingActionOtherMiracleSelectResult();
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       miracleSelectResult.copyFrom(value);
       return this;
     }
 
+    /**
+     * 
+     *  could be 1349
+     * 

+     *
+     * optional .RogueBuffRollInfo roll_buff = 1753;
+     * @return whether the rollBuff field is set
+     */
+    public boolean hasRollBuff() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * 
+     *  could be 1349
+     * 

+     *
+     * optional .RogueBuffRollInfo roll_buff = 1753;
+     * @return this
+     */
+    public HandleRogueCommonPendingActionCsReq clearRollBuff() {
+      bitField0_ &= ~0x00000008;
+      rollBuff.clear();
+      return this;
+    }
+
+    /**
+     * 
+     *  could be 1349
+     * 

+     *
+     * optional .RogueBuffRollInfo roll_buff = 1753;
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableRollBuff()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getRollBuff() {
+      return rollBuff;
+    }
+
+    /**
+     * 
+     *  could be 1349
+     * 

+     *
+     * optional .RogueBuffRollInfo roll_buff = 1753;
+     *
+     * 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 RogueBuffRollInfoOuterClass.RogueBuffRollInfo getMutableRollBuff() {
+      clearPendingActionOtherRollBuff();
+      bitField0_ |= 0x00000008;
+      return rollBuff;
+    }
+
+    /**
+     * 
+     *  could be 1349
+     * 

+     *
+     * optional .RogueBuffRollInfo roll_buff = 1753;
+     * @param value the rollBuff to set
+     * @return this
+     */
+    public HandleRogueCommonPendingActionCsReq setRollBuff(
+        final RogueBuffRollInfoOuterClass.RogueBuffRollInfo value) {
+      clearPendingActionOtherRollBuff();
+      bitField0_ |= 0x00000008;
+      rollBuff.copyFrom(value);
+      return this;
+    }
+
     @Override
     public HandleRogueCommonPendingActionCsReq copyFrom(
         final HandleRogueCommonPendingActionCsReq other) {
@@ -415,9 +415,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         buffSelectResult.copyFrom(other.buffSelectResult);
-        rollBuff.copyFrom(other.rollBuff);
         bonusSelectResult.copyFrom(other.bonusSelectResult);
         miracleSelectResult.copyFrom(other.miracleSelectResult);
+        rollBuff.copyFrom(other.rollBuff);
       }
       return this;
     }
@@ -432,15 +432,15 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
       if (other.hasBuffSelectResult()) {
         getMutableBuffSelectResult().mergeFrom(other.buffSelectResult);
       }
-      if (other.hasRollBuff()) {
-        getMutableRollBuff().mergeFrom(other.rollBuff);
-      }
       if (other.hasBonusSelectResult()) {
         getMutableBonusSelectResult().mergeFrom(other.bonusSelectResult);
       }
       if (other.hasMiracleSelectResult()) {
         getMutableMiracleSelectResult().mergeFrom(other.miracleSelectResult);
       }
+      if (other.hasRollBuff()) {
+        getMutableRollBuff().mergeFrom(other.rollBuff);
+      }
       return this;
     }
 
@@ -452,9 +452,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       buffSelectResult.clear();
-      rollBuff.clear();
       bonusSelectResult.clear();
       miracleSelectResult.clear();
+      rollBuff.clear();
       return this;
     }
 
@@ -466,9 +466,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       buffSelectResult.clearQuick();
-      rollBuff.clearQuick();
       bonusSelectResult.clearQuick();
       miracleSelectResult.clearQuick();
+      rollBuff.clearQuick();
       return this;
     }
 
@@ -483,29 +483,29 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
       HandleRogueCommonPendingActionCsReq other = (HandleRogueCommonPendingActionCsReq) o;
       return bitField0_ == other.bitField0_
         && (!hasBuffSelectResult() || buffSelectResult.equals(other.buffSelectResult))
-        && (!hasRollBuff() || rollBuff.equals(other.rollBuff))
         && (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult))
-        && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult));
+        && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult))
+        && (!hasRollBuff() || rollBuff.equals(other.rollBuff));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawLittleEndian16((short) 5034);
+        output.writeRawLittleEndian16((short) 11914);
         output.writeMessageNoTag(buffSelectResult);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawLittleEndian16((short) 16258);
-        output.writeMessageNoTag(rollBuff);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawLittleEndian16((short) 18594);
         output.writeMessageNoTag(bonusSelectResult);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawLittleEndian16((short) 19402);
         output.writeMessageNoTag(miracleSelectResult);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeRawLittleEndian16((short) 28106);
+        output.writeMessageNoTag(rollBuff);
+      }
     }
 
     @Override
@@ -515,14 +515,14 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
         size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectResult);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000004) != 0) {
         size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff);
+      }
       return size;
     }
 
@@ -534,22 +534,12 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 2474: {
+          case 5898: {
             // buffSelectResult
             clearPendingActionOtherBuffSelectResult();
             input.readMessage(buffSelectResult);
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 8066) {
-              break;
-            }
-          }
-          case 8066: {
-            // rollBuff
-            clearPendingActionOtherRollBuff();
-            input.readMessage(rollBuff);
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
             if (tag != 9250) {
               break;
             }
@@ -558,7 +548,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
             // bonusSelectResult
             clearPendingActionOtherBonusSelectResult();
             input.readMessage(bonusSelectResult);
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 9674) {
               break;
@@ -568,6 +558,16 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
             // miracleSelectResult
             clearPendingActionOtherMiracleSelectResult();
             input.readMessage(miracleSelectResult);
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 14026) {
+              break;
+            }
+          }
+          case 14026: {
+            // rollBuff
+            clearPendingActionOtherRollBuff();
+            input.readMessage(rollBuff);
             bitField0_ |= 0x00000008;
             tag = input.readTag();
             if (tag != 0) {
@@ -595,14 +595,14 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
         output.writeMessage(FieldNames.buffSelectResult, buffSelectResult);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeMessage(FieldNames.rollBuff, rollBuff);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000004) != 0) {
         output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeMessage(FieldNames.rollBuff, rollBuff);
+      }
       output.endObject();
     }
 
@@ -627,26 +627,13 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
             }
             break;
           }
-          case -260653456:
-          case 535908053: {
-            if (input.isAtField(FieldNames.rollBuff)) {
-              if (!input.trySkipNullValue()) {
-                clearPendingActionOtherRollBuff();
-                input.readMessage(rollBuff);
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case 732920312:
           case 396692640: {
             if (input.isAtField(FieldNames.bonusSelectResult)) {
               if (!input.trySkipNullValue()) {
                 clearPendingActionOtherBonusSelectResult();
                 input.readMessage(bonusSelectResult);
-                bitField0_ |= 0x00000004;
+                bitField0_ |= 0x00000002;
               }
             } else {
               input.skipUnknownField();
@@ -659,6 +646,19 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
               if (!input.trySkipNullValue()) {
                 clearPendingActionOtherMiracleSelectResult();
                 input.readMessage(miracleSelectResult);
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case -260653456:
+          case 535908053: {
+            if (input.isAtField(FieldNames.rollBuff)) {
+              if (!input.trySkipNullValue()) {
+                clearPendingActionOtherRollBuff();
+                input.readMessage(rollBuff);
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -723,11 +723,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
     static class FieldNames {
       static final FieldName buffSelectResult = FieldName.forField("buffSelectResult", "buff_select_result");
 
-      static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff");
-
       static final FieldName bonusSelectResult = FieldName.forField("bonusSelectResult", "bonus_select_result");
 
       static final FieldName miracleSelectResult = FieldName.forField("miracleSelectResult", "miracle_select_result");
+
+      static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java
index adc61dc..592477f 100644
--- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java
@@ -18,50 +18,38 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
   public static final class HandleRogueCommonPendingActionScRsp extends ProtoMessage implements Cloneable {
     private static final long serialVersionUID = 0L;
 
+    /**
+     * optional uint32 retcode = 2;
+     */
+    private int retcode;
+
     /**
      * optional uint32 action_unique_id = 5;
      */
     private int actionUniqueId;
 
     /**
-     * optional uint32 times2 = 7;
+     * optional uint32 times2 = 10;
      */
     private int times2;
 
     /**
-     * optional uint32 retcode = 9;
-     */
-    private int retcode;
-
-    /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBonusSelect bonus_select = 157;
+     * optional .RogueBonusSelect bonus_select = 90;
      */
     private final RogueBonusSelectOuterClass.RogueBonusSelect bonusSelect = RogueBonusSelectOuterClass.RogueBonusSelect.newInstance();
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueRerollBuff rogue_reroll_buff = 952;
+     * optional .RogueRerollBuff rogue_reroll_buff = 461;
      */
     private final RogueRerollBuffOuterClass.RogueRerollBuff rogueRerollBuff = RogueRerollBuffOuterClass.RogueRerollBuff.newInstance();
 
     /**
-     * optional .RogueMiracleSelect miracle_select = 1077;
+     * optional .RogueMiracleSelect miracle_select = 1604;
      */
     private final RogueMiracleSelectOuterClass.RogueMiracleSelect miracleSelect = RogueMiracleSelectOuterClass.RogueMiracleSelect.newInstance();
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBuffSelect rogue_buff_select = 1689;
+     * optional .RogueBuffSelect rogue_buff_select = 1733;
      */
     private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance();
 
@@ -75,12 +63,49 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
       return new HandleRogueCommonPendingActionScRsp();
     }
 
+    /**
+     * 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 HandleRogueCommonPendingActionScRsp 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 HandleRogueCommonPendingActionScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000001;
+      retcode = value;
+      return this;
+    }
+
     /**
      * optional uint32 action_unique_id = 5;
      * @return whether the actionUniqueId field is set
      */
     public boolean hasActionUniqueId() {
-      return (bitField0_ & 0x00000001) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
@@ -88,7 +113,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
      * @return this
      */
     public HandleRogueCommonPendingActionScRsp clearActionUniqueId() {
-      bitField0_ &= ~0x00000001;
+      bitField0_ &= ~0x00000002;
       actionUniqueId = 0;
       return this;
     }
@@ -107,31 +132,31 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
      * @return this
      */
     public HandleRogueCommonPendingActionScRsp setActionUniqueId(final int value) {
-      bitField0_ |= 0x00000001;
+      bitField0_ |= 0x00000002;
       actionUniqueId = value;
       return this;
     }
 
     /**
-     * optional uint32 times2 = 7;
+     * optional uint32 times2 = 10;
      * @return whether the times2 field is set
      */
     public boolean hasTimes2() {
-      return (bitField0_ & 0x00000002) != 0;
+      return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional uint32 times2 = 7;
+     * optional uint32 times2 = 10;
      * @return this
      */
     public HandleRogueCommonPendingActionScRsp clearTimes2() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000004;
       times2 = 0;
       return this;
     }
 
     /**
-     * optional uint32 times2 = 7;
+     * optional uint32 times2 = 10;
      * @return the times2
      */
     public int getTimes2() {
@@ -139,59 +164,18 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * optional uint32 times2 = 7;
+     * optional uint32 times2 = 10;
      * @param value the times2 to set
      * @return this
      */
     public HandleRogueCommonPendingActionScRsp setTimes2(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000004;
       times2 = value;
       return this;
     }
 
     /**
-     * optional uint32 retcode = 9;
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * optional uint32 retcode = 9;
-     * @return this
-     */
-    public HandleRogueCommonPendingActionScRsp clearRetcode() {
-      bitField0_ &= ~0x00000004;
-      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 HandleRogueCommonPendingActionScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000004;
-      retcode = value;
-      return this;
-    }
-
-    /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBonusSelect bonus_select = 157;
+     * optional .RogueBonusSelect bonus_select = 90;
      * @return whether the bonusSelect field is set
      */
     public boolean hasBonusSelect() {
@@ -199,11 +183,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBonusSelect bonus_select = 157;
+     * optional .RogueBonusSelect bonus_select = 90;
      * @return this
      */
     public HandleRogueCommonPendingActionScRsp clearBonusSelect() {
@@ -213,11 +193,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBonusSelect bonus_select = 157;
+     * optional .RogueBonusSelect bonus_select = 90;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -231,11 +207,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBonusSelect bonus_select = 157;
+     * optional .RogueBonusSelect bonus_select = 90;
      *
      * 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,11 +221,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBonusSelect bonus_select = 157;
+     * optional .RogueBonusSelect bonus_select = 90;
      * @param value the bonusSelect to set
      * @return this
      */
@@ -265,11 +233,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueRerollBuff rogue_reroll_buff = 952;
+     * optional .RogueRerollBuff rogue_reroll_buff = 461;
      * @return whether the rogueRerollBuff field is set
      */
     public boolean hasRogueRerollBuff() {
@@ -277,11 +241,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueRerollBuff rogue_reroll_buff = 952;
+     * optional .RogueRerollBuff rogue_reroll_buff = 461;
      * @return this
      */
     public HandleRogueCommonPendingActionScRsp clearRogueRerollBuff() {
@@ -291,11 +251,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueRerollBuff rogue_reroll_buff = 952;
+     * optional .RogueRerollBuff rogue_reroll_buff = 461;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -309,11 +265,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueRerollBuff rogue_reroll_buff = 952;
+     * optional .RogueRerollBuff rogue_reroll_buff = 461;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -327,11 +279,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueRerollBuff rogue_reroll_buff = 952;
+     * optional .RogueRerollBuff rogue_reroll_buff = 461;
      * @param value the rogueRerollBuff to set
      * @return this
      */
@@ -343,7 +291,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * optional .RogueMiracleSelect miracle_select = 1077;
+     * optional .RogueMiracleSelect miracle_select = 1604;
      * @return whether the miracleSelect field is set
      */
     public boolean hasMiracleSelect() {
@@ -351,7 +299,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * optional .RogueMiracleSelect miracle_select = 1077;
+     * optional .RogueMiracleSelect miracle_select = 1604;
      * @return this
      */
     public HandleRogueCommonPendingActionScRsp clearMiracleSelect() {
@@ -361,7 +309,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * optional .RogueMiracleSelect miracle_select = 1077;
+     * optional .RogueMiracleSelect miracle_select = 1604;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -375,7 +323,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * optional .RogueMiracleSelect miracle_select = 1077;
+     * optional .RogueMiracleSelect miracle_select = 1604;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -389,7 +337,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * optional .RogueMiracleSelect miracle_select = 1077;
+     * optional .RogueMiracleSelect miracle_select = 1604;
      * @param value the miracleSelect to set
      * @return this
      */
@@ -401,11 +349,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBuffSelect rogue_buff_select = 1689;
+     * optional .RogueBuffSelect rogue_buff_select = 1733;
      * @return whether the rogueBuffSelect field is set
      */
     public boolean hasRogueBuffSelect() {
@@ -413,11 +357,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBuffSelect rogue_buff_select = 1689;
+     * optional .RogueBuffSelect rogue_buff_select = 1733;
      * @return this
      */
     public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() {
@@ -427,11 +367,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBuffSelect rogue_buff_select = 1689;
+     * optional .RogueBuffSelect rogue_buff_select = 1733;
      *
      * This 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,11 +381,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBuffSelect rogue_buff_select = 1689;
+     * optional .RogueBuffSelect rogue_buff_select = 1733;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -463,11 +395,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     }
 
     /**
-     * 
-     *  idk
-     * 

-     *
-     * optional .RogueBuffSelect rogue_buff_select = 1689;
+     * optional .RogueBuffSelect rogue_buff_select = 1733;
      * @param value the rogueBuffSelect to set
      * @return this
      */
@@ -484,9 +412,9 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
+        retcode = other.retcode;
         actionUniqueId = other.actionUniqueId;
         times2 = other.times2;
-        retcode = other.retcode;
         bonusSelect.copyFrom(other.bonusSelect);
         rogueRerollBuff.copyFrom(other.rogueRerollBuff);
         miracleSelect.copyFrom(other.miracleSelect);
@@ -502,15 +430,15 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
         return this;
       }
       cachedSize = -1;
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
+      }
       if (other.hasActionUniqueId()) {
         setActionUniqueId(other.actionUniqueId);
       }
       if (other.hasTimes2()) {
         setTimes2(other.times2);
       }
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
-      }
       if (other.hasBonusSelect()) {
         getMutableBonusSelect().mergeFrom(other.bonusSelect);
       }
@@ -533,9 +461,9 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
+      retcode = 0;
       actionUniqueId = 0;
       times2 = 0;
-      retcode = 0;
       bonusSelect.clear();
       rogueRerollBuff.clear();
       miracleSelect.clear();
@@ -567,9 +495,9 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
       }
       HandleRogueCommonPendingActionScRsp other = (HandleRogueCommonPendingActionScRsp) o;
       return bitField0_ == other.bitField0_
+        && (!hasRetcode() || retcode == other.retcode)
         && (!hasActionUniqueId() || actionUniqueId == other.actionUniqueId)
         && (!hasTimes2() || times2 == other.times2)
-        && (!hasRetcode() || retcode == other.retcode)
         && (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect))
         && (!hasRogueRerollBuff() || rogueRerollBuff.equals(other.rogueRerollBuff))
         && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect))
@@ -579,31 +507,31 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     @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) 40);
         output.writeUInt32NoTag(actionUniqueId);
       }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(times2);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(retcode);
-      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawLittleEndian16((short) 2538);
+        output.writeRawLittleEndian16((short) 1490);
         output.writeMessageNoTag(bonusSelect);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawLittleEndian16((short) 15298);
+        output.writeRawLittleEndian16((short) 7402);
         output.writeMessageNoTag(rogueRerollBuff);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawLittleEndian16((short) 17322);
+        output.writeRawLittleEndian16((short) 25762);
         output.writeMessageNoTag(miracleSelect);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawLittleEndian16((short) 27082);
+        output.writeRawLittleEndian16((short) 27818);
         output.writeMessageNoTag(rogueBuffSelect);
       }
     }
@@ -612,13 +540,13 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(actionUniqueId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(times2);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(actionUniqueId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(times2);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect);
@@ -643,61 +571,61 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
+          case 16: {
+            // retcode
+            retcode = input.readUInt32();
+            bitField0_ |= 0x00000001;
+            tag = input.readTag();
+            if (tag != 40) {
+              break;
+            }
+          }
           case 40: {
             // actionUniqueId
             actionUniqueId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 56) {
-              break;
-            }
-          }
-          case 56: {
-            // times2
-            times2 = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 72) {
+            if (tag != 80) {
               break;
             }
           }
-          case 72: {
-            // retcode
-            retcode = input.readUInt32();
+          case 80: {
+            // times2
+            times2 = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 1258) {
+            if (tag != 722) {
               break;
             }
           }
-          case 1258: {
+          case 722: {
             // bonusSelect
             input.readMessage(bonusSelect);
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 7618) {
+            if (tag != 3690) {
               break;
             }
           }
-          case 7618: {
+          case 3690: {
             // rogueRerollBuff
             input.readMessage(rogueRerollBuff);
             bitField0_ |= 0x00000010;
             tag = input.readTag();
-            if (tag != 8618) {
+            if (tag != 12834) {
               break;
             }
           }
-          case 8618: {
+          case 12834: {
             // miracleSelect
             input.readMessage(miracleSelect);
             bitField0_ |= 0x00000020;
             tag = input.readTag();
-            if (tag != 13514) {
+            if (tag != 13866) {
               break;
             }
           }
-          case 13514: {
+          case 13866: {
             // rogueBuffSelect
             input.readMessage(rogueBuffSelect);
             bitField0_ |= 0x00000040;
@@ -724,13 +652,13 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.actionUniqueId, actionUniqueId);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.times2, times2);
+        output.writeUInt32(FieldNames.actionUniqueId, actionUniqueId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.times2, times2);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeMessage(FieldNames.bonusSelect, bonusSelect);
@@ -755,12 +683,23 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
       }
       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 -208785118:
           case 1003664768: {
             if (input.isAtField(FieldNames.actionUniqueId)) {
               if (!input.trySkipNullValue()) {
                 actionUniqueId = input.readUInt32();
-                bitField0_ |= 0x00000001;
+                bitField0_ |= 0x00000002;
               }
             } else {
               input.skipUnknownField();
@@ -771,17 +710,6 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
             if (input.isAtField(FieldNames.times2)) {
               if (!input.trySkipNullValue()) {
                 times2 = input.readUInt32();
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
-              if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -892,12 +820,12 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
+      static final FieldName retcode = FieldName.forField("retcode");
+
       static final FieldName actionUniqueId = FieldName.forField("actionUniqueId", "action_unique_id");
 
       static final FieldName times2 = FieldName.forField("times2");
 
-      static final FieldName retcode = FieldName.forField("retcode");
-
       static final FieldName bonusSelect = FieldName.forField("bonusSelect", "bonus_select");
 
       static final FieldName rogueRerollBuff = FieldName.forField("rogueRerollBuff", "rogue_reroll_buff");
diff --git a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java
index 5f4a632..455ec38 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 = 5;
+     * optional uint32 id = 15;
      */
     private int id;
 
@@ -34,7 +34,7 @@ public final class HeadIconOuterClass {
     }
 
     /**
-     * optional uint32 id = 5;
+     * optional uint32 id = 15;
      * @return whether the id field is set
      */
     public boolean hasId() {
@@ -42,7 +42,7 @@ public final class HeadIconOuterClass {
     }
 
     /**
-     * optional uint32 id = 5;
+     * optional uint32 id = 15;
      * @return this
      */
     public HeadIcon clearId() {
@@ -52,7 +52,7 @@ public final class HeadIconOuterClass {
     }
 
     /**
-     * optional uint32 id = 5;
+     * optional uint32 id = 15;
      * @return the id
      */
     public int getId() {
@@ -60,7 +60,7 @@ public final class HeadIconOuterClass {
     }
 
     /**
-     * optional uint32 id = 5;
+     * optional uint32 id = 15;
      * @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) 40);
+        output.writeRawByte((byte) 120);
         output.writeUInt32NoTag(id);
       }
     }
@@ -150,7 +150,7 @@ public final class HeadIconOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
+          case 120: {
             // id
             id = input.readUInt32();
             bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeOuterClass.java
index e9ddb81..a6864cd 100644
--- a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeOuterClass.java
@@ -187,7 +187,7 @@ public final class HeroBasicTypeOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return HeroBasicTypeConverter.INSTANCE;
     }
 
@@ -209,7 +209,7 @@ public final class HeroBasicTypeOuterClass {
       return value == null ? other : value;
     }
 
-    enum HeroBasicTypeConverter implements EnumConverter {
+    enum HeroBasicTypeConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       @Override
diff --git a/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java
index 0fbc4a2..5b7d65b 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 = 2;
+     * optional .ChargerInfo charger_info = 13;
      */
     private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance();
 
@@ -34,7 +34,7 @@ public final class InteractChargerCsReqOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 2;
+     * optional .ChargerInfo charger_info = 13;
      * @return whether the chargerInfo field is set
      */
     public boolean hasChargerInfo() {
@@ -42,7 +42,7 @@ public final class InteractChargerCsReqOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 2;
+     * optional .ChargerInfo charger_info = 13;
      * @return this
      */
     public InteractChargerCsReq clearChargerInfo() {
@@ -52,7 +52,7 @@ public final class InteractChargerCsReqOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 2;
+     * optional .ChargerInfo charger_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 InteractChargerCsReqOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 2;
+     * optional .ChargerInfo charger_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 InteractChargerCsReqOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 2;
+     * optional .ChargerInfo charger_info = 13;
      * @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) 18);
+        output.writeRawByte((byte) 106);
         output.writeMessageNoTag(chargerInfo);
       }
     }
@@ -171,7 +171,7 @@ public final class InteractChargerCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 18: {
+          case 106: {
             // 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 e0c88ac..762613d 100644
--- a/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java
@@ -24,12 +24,12 @@ public final class InteractChargerScRspOuterClass {
     private int retcode;
 
     /**
-     * optional .ChargerInfo charger_info = 6;
+     * optional .ChargerInfo charger_info = 1;
      */
     private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance();
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 12;
+     * optional .RotatorEnergyInfo energy_info = 8;
      */
     private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance();
 
@@ -81,7 +81,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 6;
+     * optional .ChargerInfo charger_info = 1;
      * @return whether the chargerInfo field is set
      */
     public boolean hasChargerInfo() {
@@ -89,7 +89,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 6;
+     * optional .ChargerInfo charger_info = 1;
      * @return this
      */
     public InteractChargerScRsp clearChargerInfo() {
@@ -99,7 +99,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 6;
+     * optional .ChargerInfo charger_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.
@@ -113,7 +113,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 6;
+     * optional .ChargerInfo charger_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
@@ -127,7 +127,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .ChargerInfo charger_info = 6;
+     * optional .ChargerInfo charger_info = 1;
      * @param value the chargerInfo to set
      * @return this
      */
@@ -138,7 +138,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 12;
+     * optional .RotatorEnergyInfo energy_info = 8;
      * @return whether the energyInfo field is set
      */
     public boolean hasEnergyInfo() {
@@ -146,7 +146,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 12;
+     * optional .RotatorEnergyInfo energy_info = 8;
      * @return this
      */
     public InteractChargerScRsp clearEnergyInfo() {
@@ -156,7 +156,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 12;
+     * optional .RotatorEnergyInfo energy_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.
@@ -170,7 +170,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 12;
+     * optional .RotatorEnergyInfo energy_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
@@ -184,7 +184,7 @@ public final class InteractChargerScRspOuterClass {
     }
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 12;
+     * optional .RotatorEnergyInfo energy_info = 8;
      * @param value the energyInfo to set
      * @return this
      */
@@ -272,11 +272,11 @@ public final class InteractChargerScRspOuterClass {
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 50);
+        output.writeRawByte((byte) 10);
         output.writeMessageNoTag(chargerInfo);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 98);
+        output.writeRawByte((byte) 66);
         output.writeMessageNoTag(energyInfo);
       }
     }
@@ -308,20 +308,20 @@ public final class InteractChargerScRspOuterClass {
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 50) {
+            if (tag != 10) {
               break;
             }
           }
-          case 50: {
+          case 10: {
             // chargerInfo
             input.readMessage(chargerInfo);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 98) {
+            if (tag != 66) {
               break;
             }
           }
-          case 98: {
+          case 66: {
             // energyInfo
             input.readMessage(energyInfo);
             bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java
index 545a1bc..eca8b64 100644
--- a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class InteractPropCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 interact_id = 13;
+     * optional uint32 interact_id = 1;
      */
     private int interactId;
 
     /**
-     * optional uint32 prop_entity_id = 15;
+     * optional uint32 prop_entity_id = 11;
      */
     private int propEntityId;
 
@@ -39,7 +39,7 @@ public final class InteractPropCsReqOuterClass {
     }
 
     /**
-     * optional uint32 interact_id = 13;
+     * optional uint32 interact_id = 1;
      * @return whether the interactId field is set
      */
     public boolean hasInteractId() {
@@ -47,7 +47,7 @@ public final class InteractPropCsReqOuterClass {
     }
 
     /**
-     * optional uint32 interact_id = 13;
+     * optional uint32 interact_id = 1;
      * @return this
      */
     public InteractPropCsReq clearInteractId() {
@@ -57,7 +57,7 @@ public final class InteractPropCsReqOuterClass {
     }
 
     /**
-     * optional uint32 interact_id = 13;
+     * optional uint32 interact_id = 1;
      * @return the interactId
      */
     public int getInteractId() {
@@ -65,7 +65,7 @@ public final class InteractPropCsReqOuterClass {
     }
 
     /**
-     * optional uint32 interact_id = 13;
+     * optional uint32 interact_id = 1;
      * @param value the interactId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class InteractPropCsReqOuterClass {
     }
 
     /**
-     * optional uint32 prop_entity_id = 15;
+     * optional uint32 prop_entity_id = 11;
      * @return whether the propEntityId field is set
      */
     public boolean hasPropEntityId() {
@@ -84,7 +84,7 @@ public final class InteractPropCsReqOuterClass {
     }
 
     /**
-     * optional uint32 prop_entity_id = 15;
+     * optional uint32 prop_entity_id = 11;
      * @return this
      */
     public InteractPropCsReq clearPropEntityId() {
@@ -94,7 +94,7 @@ public final class InteractPropCsReqOuterClass {
     }
 
     /**
-     * optional uint32 prop_entity_id = 15;
+     * optional uint32 prop_entity_id = 11;
      * @return the propEntityId
      */
     public int getPropEntityId() {
@@ -102,7 +102,7 @@ public final class InteractPropCsReqOuterClass {
     }
 
     /**
-     * optional uint32 prop_entity_id = 15;
+     * optional uint32 prop_entity_id = 11;
      * @param value the propEntityId to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class InteractPropCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(interactId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(propEntityId);
       }
     }
@@ -205,16 +205,16 @@ public final class InteractPropCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 104: {
+          case 8: {
             // interactId
             interactId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 88) {
               break;
             }
           }
-          case 120: {
+          case 88: {
             // propEntityId
             propEntityId = input.readUInt32();
             bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java
index 5e320b6..bb4dda4 100644
--- a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class InteractPropScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 prop_state = 2;
+     * optional uint32 prop_state = 1;
      */
     private int propState;
 
     /**
-     * optional uint32 prop_entity_id = 10;
+     * optional uint32 prop_entity_id = 6;
      */
     private int propEntityId;
 
     /**
-     * optional uint32 retcode = 11;
+     * optional uint32 retcode = 10;
      */
     private int retcode;
 
@@ -44,7 +44,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 prop_state = 2;
+     * optional uint32 prop_state = 1;
      * @return whether the propState field is set
      */
     public boolean hasPropState() {
@@ -52,7 +52,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 prop_state = 2;
+     * optional uint32 prop_state = 1;
      * @return this
      */
     public InteractPropScRsp clearPropState() {
@@ -62,7 +62,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 prop_state = 2;
+     * optional uint32 prop_state = 1;
      * @return the propState
      */
     public int getPropState() {
@@ -70,7 +70,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 prop_state = 2;
+     * optional uint32 prop_state = 1;
      * @param value the propState to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 prop_entity_id = 10;
+     * optional uint32 prop_entity_id = 6;
      * @return whether the propEntityId field is set
      */
     public boolean hasPropEntityId() {
@@ -89,7 +89,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 prop_entity_id = 10;
+     * optional uint32 prop_entity_id = 6;
      * @return this
      */
     public InteractPropScRsp clearPropEntityId() {
@@ -99,7 +99,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 prop_entity_id = 10;
+     * optional uint32 prop_entity_id = 6;
      * @return the propEntityId
      */
     public int getPropEntityId() {
@@ -107,7 +107,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 prop_entity_id = 10;
+     * optional uint32 prop_entity_id = 6;
      * @param value the propEntityId to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 11;
+     * optional uint32 retcode = 10;
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -126,7 +126,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 11;
+     * optional uint32 retcode = 10;
      * @return this
      */
     public InteractPropScRsp clearRetcode() {
@@ -136,7 +136,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 11;
+     * optional uint32 retcode = 10;
      * @return the retcode
      */
     public int getRetcode() {
@@ -144,7 +144,7 @@ public final class InteractPropScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 11;
+     * optional uint32 retcode = 10;
      * @param value the retcode to set
      * @return this
      */
@@ -225,15 +225,15 @@ public final class InteractPropScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(propState);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(propEntityId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(retcode);
       }
     }
@@ -260,25 +260,25 @@ public final class InteractPropScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
+          case 8: {
             // propState
             propState = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
+            if (tag != 48) {
+              break;
+            }
+          }
+          case 48: {
+            // propEntityId
+            propEntityId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
             if (tag != 80) {
               break;
             }
           }
           case 80: {
-            // propEntityId
-            propEntityId = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java
index 1c62993..fddb7dc 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 = 11;
+     * repeated .ItemCost item_list = 9;
      */
     private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory());
 
@@ -35,7 +35,7 @@ public final class ItemCostListOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 11;
+     * repeated .ItemCost item_list = 9;
      * @return whether the itemList field is set
      */
     public boolean hasItemList() {
@@ -43,7 +43,7 @@ public final class ItemCostListOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 11;
+     * repeated .ItemCost item_list = 9;
      * @return this
      */
     public ItemCostList clearItemList() {
@@ -53,7 +53,7 @@ public final class ItemCostListOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 11;
+     * repeated .ItemCost item_list = 9;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class ItemCostListOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 11;
+     * repeated .ItemCost item_list = 9;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class ItemCostListOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 11;
+     * repeated .ItemCost item_list = 9;
      * @param value the itemList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class ItemCostListOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 11;
+     * repeated .ItemCost item_list = 9;
      * @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) 90);
+          output.writeRawByte((byte) 74);
           output.writeMessageNoTag(itemList.get(i));
         }
       }
@@ -185,7 +185,7 @@ public final class ItemCostListOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 90: {
+          case 74: {
             // 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 9ce4ba1..6151ba7 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 = 8;
+     * optional uint32 equipment_unique_id = 11;
      */
     private int equipmentUniqueId;
 
     /**
-     * optional uint32 relic_unique_id = 14;
+     * optional uint32 relic_unique_id = 13;
      */
     private int relicUniqueId;
 
     /**
-     * optional .PileItem pile_item = 4;
+     * optional .PileItem pile_item = 12;
      */
     private final PileItemOuterClass.PileItem pileItem = PileItemOuterClass.PileItem.newInstance();
 
@@ -44,7 +44,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 8;
+     * optional uint32 equipment_unique_id = 11;
      * @return whether the equipmentUniqueId field is set
      */
     public boolean hasEquipmentUniqueId() {
@@ -52,7 +52,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 8;
+     * optional uint32 equipment_unique_id = 11;
      * @return this
      */
     public ItemCost clearEquipmentUniqueId() {
@@ -62,7 +62,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 8;
+     * optional uint32 equipment_unique_id = 11;
      * @return the equipmentUniqueId
      */
     public int getEquipmentUniqueId() {
@@ -70,7 +70,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 8;
+     * optional uint32 equipment_unique_id = 11;
      * @param value the equipmentUniqueId to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional uint32 relic_unique_id = 14;
+     * optional uint32 relic_unique_id = 13;
      * @return whether the relicUniqueId field is set
      */
     public boolean hasRelicUniqueId() {
@@ -89,7 +89,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional uint32 relic_unique_id = 14;
+     * optional uint32 relic_unique_id = 13;
      * @return this
      */
     public ItemCost clearRelicUniqueId() {
@@ -99,7 +99,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional uint32 relic_unique_id = 14;
+     * optional uint32 relic_unique_id = 13;
      * @return the relicUniqueId
      */
     public int getRelicUniqueId() {
@@ -107,7 +107,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional uint32 relic_unique_id = 14;
+     * optional uint32 relic_unique_id = 13;
      * @param value the relicUniqueId to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional .PileItem pile_item = 4;
+     * optional .PileItem pile_item = 12;
      * @return whether the pileItem field is set
      */
     public boolean hasPileItem() {
@@ -126,7 +126,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional .PileItem pile_item = 4;
+     * optional .PileItem pile_item = 12;
      * @return this
      */
     public ItemCost clearPileItem() {
@@ -136,7 +136,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional .PileItem pile_item = 4;
+     * optional .PileItem pile_item = 12;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional .PileItem pile_item = 4;
+     * optional .PileItem pile_item = 12;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class ItemCostOuterClass {
     }
 
     /**
-     * optional .PileItem pile_item = 4;
+     * optional .PileItem pile_item = 12;
      * @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) 64);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(equipmentUniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 112);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(relicUniqueId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 34);
+        output.writeRawByte((byte) 98);
         output.writeMessageNoTag(pileItem);
       }
     }
@@ -281,25 +281,25 @@ public final class ItemCostOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 64: {
+          case 88: {
             // equipmentUniqueId
             equipmentUniqueId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 112) {
+            if (tag != 104) {
               break;
             }
           }
-          case 112: {
+          case 104: {
             // relicUniqueId
             relicUniqueId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 34) {
+            if (tag != 98) {
               break;
             }
           }
-          case 34: {
+          case 98: {
             // 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 f6c4d48..cc08d24 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 = 15;
+     * repeated .Item item_list = 10;
      */
     private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemOuterClass.Item.getFactory());
 
@@ -35,7 +35,7 @@ public final class ItemListOuterClass {
     }
 
     /**
-     * repeated .Item item_list = 15;
+     * repeated .Item item_list = 10;
      * @return whether the itemList field is set
      */
     public boolean hasItemList() {
@@ -43,7 +43,7 @@ public final class ItemListOuterClass {
     }
 
     /**
-     * repeated .Item item_list = 15;
+     * repeated .Item item_list = 10;
      * @return this
      */
     public ItemList clearItemList() {
@@ -53,7 +53,7 @@ public final class ItemListOuterClass {
     }
 
     /**
-     * repeated .Item item_list = 15;
+     * repeated .Item 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.
@@ -67,7 +67,7 @@ public final class ItemListOuterClass {
     }
 
     /**
-     * repeated .Item item_list = 15;
+     * repeated .Item 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
@@ -81,7 +81,7 @@ public final class ItemListOuterClass {
     }
 
     /**
-     * repeated .Item item_list = 15;
+     * repeated .Item item_list = 10;
      * @param value the itemList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class ItemListOuterClass {
     }
 
     /**
-     * repeated .Item item_list = 15;
+     * repeated .Item item_list = 10;
      * @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) 122);
+          output.writeRawByte((byte) 82);
           output.writeMessageNoTag(itemList.get(i));
         }
       }
@@ -185,7 +185,7 @@ public final class ItemListOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 122: {
+          case 82: {
             // 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 e7c3abb..c518ae5 100644
--- a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java
@@ -19,40 +19,40 @@ public final class ItemOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 promotion = 1;
-     */
-    private int promotion;
-
-    /**
-     * optional uint32 num = 4;
+     * optional uint32 num = 1;
      */
     private int num;
 
     /**
-     * optional uint32 level = 5;
+     * optional uint32 promotion = 2;
      */
-    private int level;
+    private int promotion;
 
     /**
-     * optional uint32 item_id = 6;
-     */
-    private int itemId;
-
-    /**
-     * optional uint32 main_affix_id = 8;
+     * optional uint32 main_affix_id = 3;
      */
     private int mainAffixId;
 
     /**
-     * optional uint32 unique_id = 10;
+     * optional uint32 level = 6;
      */
-    private int uniqueId;
+    private int level;
 
     /**
-     * optional uint32 rank = 11;
+     * optional uint32 rank = 9;
      */
     private int rank;
 
+    /**
+     * optional uint32 item_id = 13;
+     */
+    private int itemId;
+
+    /**
+     * optional uint32 unique_id = 15;
+     */
+    private int uniqueId;
+
     private Item() {
     }
 
@@ -64,62 +64,25 @@ public final class ItemOuterClass {
     }
 
     /**
-     * optional uint32 promotion = 1;
-     * @return whether the promotion field is set
+     * optional uint32 num = 1;
+     * @return whether the num field is set
      */
-    public boolean hasPromotion() {
+    public boolean hasNum() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 promotion = 1;
-     * @return this
-     */
-    public Item 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 Item setPromotion(final int value) {
-      bitField0_ |= 0x00000001;
-      promotion = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 num = 4;
-     * @return whether the num field is set
-     */
-    public boolean hasNum() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 num = 4;
+     * optional uint32 num = 1;
      * @return this
      */
     public Item clearNum() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       num = 0;
       return this;
     }
 
     /**
-     * optional uint32 num = 4;
+     * optional uint32 num = 1;
      * @return the num
      */
     public int getNum() {
@@ -127,110 +90,73 @@ public final class ItemOuterClass {
     }
 
     /**
-     * optional uint32 num = 4;
+     * optional uint32 num = 1;
      * @param value the num to set
      * @return this
      */
     public Item setNum(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       num = value;
       return this;
     }
 
     /**
-     * optional uint32 level = 5;
-     * @return whether the level field is set
+     * optional uint32 promotion = 2;
+     * @return whether the promotion field is set
      */
-    public boolean hasLevel() {
+    public boolean hasPromotion() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 promotion = 2;
+     * @return this
+     */
+    public Item 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 Item setPromotion(final int value) {
+      bitField0_ |= 0x00000002;
+      promotion = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 main_affix_id = 3;
+     * @return whether the mainAffixId field is set
+     */
+    public boolean hasMainAffixId() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional uint32 level = 5;
-     * @return this
-     */
-    public Item clearLevel() {
-      bitField0_ &= ~0x00000004;
-      level = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 level = 5;
-     * @return the level
-     */
-    public int getLevel() {
-      return level;
-    }
-
-    /**
-     * optional uint32 level = 5;
-     * @param value the level to set
-     * @return this
-     */
-    public Item setLevel(final int value) {
-      bitField0_ |= 0x00000004;
-      level = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 item_id = 6;
-     * @return whether the itemId field is set
-     */
-    public boolean hasItemId() {
-      return (bitField0_ & 0x00000008) != 0;
-    }
-
-    /**
-     * optional uint32 item_id = 6;
-     * @return this
-     */
-    public Item clearItemId() {
-      bitField0_ &= ~0x00000008;
-      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 Item setItemId(final int value) {
-      bitField0_ |= 0x00000008;
-      itemId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 main_affix_id = 8;
-     * @return whether the mainAffixId field is set
-     */
-    public boolean hasMainAffixId() {
-      return (bitField0_ & 0x00000010) != 0;
-    }
-
-    /**
-     * optional uint32 main_affix_id = 8;
+     * optional uint32 main_affix_id = 3;
      * @return this
      */
     public Item clearMainAffixId() {
-      bitField0_ &= ~0x00000010;
+      bitField0_ &= ~0x00000004;
       mainAffixId = 0;
       return this;
     }
 
     /**
-     * optional uint32 main_affix_id = 8;
+     * optional uint32 main_affix_id = 3;
      * @return the mainAffixId
      */
     public int getMainAffixId() {
@@ -238,73 +164,73 @@ public final class ItemOuterClass {
     }
 
     /**
-     * optional uint32 main_affix_id = 8;
+     * optional uint32 main_affix_id = 3;
      * @param value the mainAffixId to set
      * @return this
      */
     public Item setMainAffixId(final int value) {
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000004;
       mainAffixId = value;
       return this;
     }
 
     /**
-     * optional uint32 unique_id = 10;
-     * @return whether the uniqueId field is set
+     * optional uint32 level = 6;
+     * @return whether the level field is set
      */
-    public boolean hasUniqueId() {
-      return (bitField0_ & 0x00000020) != 0;
+    public boolean hasLevel() {
+      return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * optional uint32 unique_id = 10;
+     * optional uint32 level = 6;
      * @return this
      */
-    public Item clearUniqueId() {
-      bitField0_ &= ~0x00000020;
-      uniqueId = 0;
+    public Item clearLevel() {
+      bitField0_ &= ~0x00000008;
+      level = 0;
       return this;
     }
 
     /**
-     * optional uint32 unique_id = 10;
-     * @return the uniqueId
+     * optional uint32 level = 6;
+     * @return the level
      */
-    public int getUniqueId() {
-      return uniqueId;
+    public int getLevel() {
+      return level;
     }
 
     /**
-     * optional uint32 unique_id = 10;
-     * @param value the uniqueId to set
+     * optional uint32 level = 6;
+     * @param value the level to set
      * @return this
      */
-    public Item setUniqueId(final int value) {
-      bitField0_ |= 0x00000020;
-      uniqueId = value;
+    public Item setLevel(final int value) {
+      bitField0_ |= 0x00000008;
+      level = value;
       return this;
     }
 
     /**
-     * optional uint32 rank = 11;
+     * optional uint32 rank = 9;
      * @return whether the rank field is set
      */
     public boolean hasRank() {
-      return (bitField0_ & 0x00000040) != 0;
+      return (bitField0_ & 0x00000010) != 0;
     }
 
     /**
-     * optional uint32 rank = 11;
+     * optional uint32 rank = 9;
      * @return this
      */
     public Item clearRank() {
-      bitField0_ &= ~0x00000040;
+      bitField0_ &= ~0x00000010;
       rank = 0;
       return this;
     }
 
     /**
-     * optional uint32 rank = 11;
+     * optional uint32 rank = 9;
      * @return the rank
      */
     public int getRank() {
@@ -312,28 +238,102 @@ public final class ItemOuterClass {
     }
 
     /**
-     * optional uint32 rank = 11;
+     * optional uint32 rank = 9;
      * @param value the rank to set
      * @return this
      */
     public Item setRank(final int value) {
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000010;
       rank = value;
       return this;
     }
 
+    /**
+     * optional uint32 item_id = 13;
+     * @return whether the itemId field is set
+     */
+    public boolean hasItemId() {
+      return (bitField0_ & 0x00000020) != 0;
+    }
+
+    /**
+     * optional uint32 item_id = 13;
+     * @return this
+     */
+    public Item clearItemId() {
+      bitField0_ &= ~0x00000020;
+      itemId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 item_id = 13;
+     * @return the itemId
+     */
+    public int getItemId() {
+      return itemId;
+    }
+
+    /**
+     * optional uint32 item_id = 13;
+     * @param value the itemId to set
+     * @return this
+     */
+    public Item setItemId(final int value) {
+      bitField0_ |= 0x00000020;
+      itemId = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 unique_id = 15;
+     * @return whether the uniqueId field is set
+     */
+    public boolean hasUniqueId() {
+      return (bitField0_ & 0x00000040) != 0;
+    }
+
+    /**
+     * optional uint32 unique_id = 15;
+     * @return this
+     */
+    public Item clearUniqueId() {
+      bitField0_ &= ~0x00000040;
+      uniqueId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 unique_id = 15;
+     * @return the uniqueId
+     */
+    public int getUniqueId() {
+      return uniqueId;
+    }
+
+    /**
+     * optional uint32 unique_id = 15;
+     * @param value the uniqueId to set
+     * @return this
+     */
+    public Item setUniqueId(final int value) {
+      bitField0_ |= 0x00000040;
+      uniqueId = value;
+      return this;
+    }
+
     @Override
     public Item copyFrom(final Item other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        promotion = other.promotion;
         num = other.num;
-        level = other.level;
-        itemId = other.itemId;
+        promotion = other.promotion;
         mainAffixId = other.mainAffixId;
-        uniqueId = other.uniqueId;
+        level = other.level;
         rank = other.rank;
+        itemId = other.itemId;
+        uniqueId = other.uniqueId;
       }
       return this;
     }
@@ -344,27 +344,27 @@ public final class ItemOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasPromotion()) {
-        setPromotion(other.promotion);
-      }
       if (other.hasNum()) {
         setNum(other.num);
       }
-      if (other.hasLevel()) {
-        setLevel(other.level);
-      }
-      if (other.hasItemId()) {
-        setItemId(other.itemId);
+      if (other.hasPromotion()) {
+        setPromotion(other.promotion);
       }
       if (other.hasMainAffixId()) {
         setMainAffixId(other.mainAffixId);
       }
-      if (other.hasUniqueId()) {
-        setUniqueId(other.uniqueId);
+      if (other.hasLevel()) {
+        setLevel(other.level);
       }
       if (other.hasRank()) {
         setRank(other.rank);
       }
+      if (other.hasItemId()) {
+        setItemId(other.itemId);
+      }
+      if (other.hasUniqueId()) {
+        setUniqueId(other.uniqueId);
+      }
       return this;
     }
 
@@ -375,13 +375,13 @@ public final class ItemOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      promotion = 0;
       num = 0;
-      level = 0;
-      itemId = 0;
+      promotion = 0;
       mainAffixId = 0;
-      uniqueId = 0;
+      level = 0;
       rank = 0;
+      itemId = 0;
+      uniqueId = 0;
       return this;
     }
 
@@ -405,44 +405,44 @@ public final class ItemOuterClass {
       }
       Item other = (Item) o;
       return bitField0_ == other.bitField0_
-        && (!hasPromotion() || promotion == other.promotion)
         && (!hasNum() || num == other.num)
-        && (!hasLevel() || level == other.level)
-        && (!hasItemId() || itemId == other.itemId)
+        && (!hasPromotion() || promotion == other.promotion)
         && (!hasMainAffixId() || mainAffixId == other.mainAffixId)
-        && (!hasUniqueId() || uniqueId == other.uniqueId)
-        && (!hasRank() || rank == other.rank);
+        && (!hasLevel() || level == other.level)
+        && (!hasRank() || rank == other.rank)
+        && (!hasItemId() || itemId == other.itemId)
+        && (!hasUniqueId() || uniqueId == other.uniqueId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         output.writeRawByte((byte) 8);
-        output.writeUInt32NoTag(promotion);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(num);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 16);
+        output.writeUInt32NoTag(promotion);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeUInt32NoTag(level);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(mainAffixId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeRawByte((byte) 48);
-        output.writeUInt32NoTag(itemId);
+        output.writeUInt32NoTag(level);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 64);
-        output.writeUInt32NoTag(mainAffixId);
+        output.writeRawByte((byte) 72);
+        output.writeUInt32NoTag(rank);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 80);
-        output.writeUInt32NoTag(uniqueId);
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(itemId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(rank);
+        output.writeRawByte((byte) 120);
+        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(promotion);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
-      }
-      if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
-      }
-      if ((bitField0_ & 0x00000010) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+      }
+      if ((bitField0_ & 0x00000010) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
+      }
       if ((bitField0_ & 0x00000020) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
       }
       return size;
     }
@@ -481,26 +481,26 @@ public final class ItemOuterClass {
       while (true) {
         switch (tag) {
           case 8: {
-            // promotion
-            promotion = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 32) {
-              break;
-            }
-          }
-          case 32: {
             // num
             num = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 40) {
+            if (tag != 16) {
               break;
             }
           }
-          case 40: {
-            // level
-            level = input.readUInt32();
+          case 16: {
+            // promotion
+            promotion = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 24) {
+              break;
+            }
+          }
+          case 24: {
+            // mainAffixId
+            mainAffixId = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 48) {
@@ -508,35 +508,35 @@ public final class ItemOuterClass {
             }
           }
           case 48: {
-            // itemId
-            itemId = input.readUInt32();
+            // level
+            level = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 72) {
               break;
             }
           }
-          case 64: {
-            // mainAffixId
-            mainAffixId = input.readUInt32();
-            bitField0_ |= 0x00000010;
-            tag = input.readTag();
-            if (tag != 80) {
-              break;
-            }
-          }
-          case 80: {
-            // uniqueId
-            uniqueId = input.readUInt32();
-            bitField0_ |= 0x00000020;
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
+          case 72: {
             // rank
             rank = input.readUInt32();
+            bitField0_ |= 0x00000010;
+            tag = input.readTag();
+            if (tag != 104) {
+              break;
+            }
+          }
+          case 104: {
+            // itemId
+            itemId = input.readUInt32();
+            bitField0_ |= 0x00000020;
+            tag = input.readTag();
+            if (tag != 120) {
+              break;
+            }
+          }
+          case 120: {
+            // 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.promotion, promotion);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.num, num);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeUInt32(FieldNames.promotion, promotion);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.level, level);
-      }
-      if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.itemId, itemId);
-      }
-      if ((bitField0_ & 0x00000010) != 0) {
         output.writeUInt32(FieldNames.mainAffixId, mainAffixId);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeUInt32(FieldNames.level, level);
+      }
+      if ((bitField0_ & 0x00000010) != 0) {
+        output.writeUInt32(FieldNames.rank, rank);
+      }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeUInt32(FieldNames.uniqueId, uniqueId);
+        output.writeUInt32(FieldNames.itemId, itemId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeUInt32(FieldNames.rank, rank);
+        output.writeUInt32(FieldNames.uniqueId, uniqueId);
       }
       output.endObject();
     }
@@ -591,10 +591,10 @@ public final class ItemOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -799212381: {
-            if (input.isAtField(FieldNames.promotion)) {
+          case 109446: {
+            if (input.isAtField(FieldNames.num)) {
               if (!input.trySkipNullValue()) {
-                promotion = input.readUInt32();
+                num = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -602,10 +602,10 @@ public final class ItemOuterClass {
             }
             break;
           }
-          case 109446: {
-            if (input.isAtField(FieldNames.num)) {
+          case -799212381: {
+            if (input.isAtField(FieldNames.promotion)) {
               if (!input.trySkipNullValue()) {
-                num = input.readUInt32();
+                promotion = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -613,34 +613,33 @@ public final class ItemOuterClass {
             }
             break;
           }
-          case 102865796: {
-            if (input.isAtField(FieldNames.level)) {
-              if (!input.trySkipNullValue()) {
-                level = input.readUInt32();
-                bitField0_ |= 0x00000004;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case -1178662002:
-          case 2116204999: {
-            if (input.isAtField(FieldNames.itemId)) {
-              if (!input.trySkipNullValue()) {
-                itemId = input.readUInt32();
-                bitField0_ |= 0x00000008;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case -1973876974:
           case -1426712144: {
             if (input.isAtField(FieldNames.mainAffixId)) {
               if (!input.trySkipNullValue()) {
                 mainAffixId = input.readUInt32();
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 102865796: {
+            if (input.isAtField(FieldNames.level)) {
+              if (!input.trySkipNullValue()) {
+                level = input.readUInt32();
+                bitField0_ |= 0x00000008;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 3492908: {
+            if (input.isAtField(FieldNames.rank)) {
+              if (!input.trySkipNullValue()) {
+                rank = input.readUInt32();
                 bitField0_ |= 0x00000010;
               }
             } else {
@@ -648,22 +647,23 @@ public final class ItemOuterClass {
             }
             break;
           }
+          case -1178662002:
+          case 2116204999: {
+            if (input.isAtField(FieldNames.itemId)) {
+              if (!input.trySkipNullValue()) {
+                itemId = input.readUInt32();
+                bitField0_ |= 0x00000020;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           case -294460212:
           case -538310583: {
             if (input.isAtField(FieldNames.uniqueId)) {
               if (!input.trySkipNullValue()) {
                 uniqueId = input.readUInt32();
-                bitField0_ |= 0x00000020;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case 3492908: {
-            if (input.isAtField(FieldNames.rank)) {
-              if (!input.trySkipNullValue()) {
-                rank = input.readUInt32();
                 bitField0_ |= 0x00000040;
               }
             } else {
@@ -723,19 +723,19 @@ public final class ItemOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName promotion = FieldName.forField("promotion");
-
       static final FieldName num = FieldName.forField("num");
 
-      static final FieldName level = FieldName.forField("level");
-
-      static final FieldName itemId = FieldName.forField("itemId", "item_id");
+      static final FieldName promotion = FieldName.forField("promotion");
 
       static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
 
-      static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
+      static final FieldName level = FieldName.forField("level");
 
       static final FieldName rank = FieldName.forField("rank");
+
+      static final FieldName itemId = FieldName.forField("itemId", "item_id");
+
+      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 7a0bfd4..69b4b2c 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 plane_id = 5;
-     */
-    private int planeId;
-
-    /**
-     * optional uint32 slot = 6;
+     * optional uint32 slot = 2;
      */
     private int slot;
 
     /**
-     * optional uint32 index = 11;
+     * optional uint32 index = 3;
      */
     private int index;
 
     /**
-     * optional uint32 base_avatar_id = 12;
+     * optional uint32 base_avatar_id = 11;
      */
     private int baseAvatarId;
 
     /**
-     * optional .AvatarType avatar_type = 7;
+     * optional uint32 plane_id = 14;
      */
-    private int avatarType;
+    private int planeId;
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional .ExtraLineupType extra_lineup_type = 9;
      */
     private int extraLineupType;
 
     /**
-     * optional bool is_virtual = 3;
+     * optional .AvatarType avatar_type = 15;
+     */
+    private int avatarType;
+
+    /**
+     * optional bool is_virtual = 13;
      */
     private boolean isVirtual;
 
@@ -64,62 +64,25 @@ public final class JoinLineupCsReqOuterClass {
     }
 
     /**
-     * optional uint32 plane_id = 5;
-     * @return whether the planeId field is set
+     * optional uint32 slot = 2;
+     * @return whether the slot field is set
      */
-    public boolean hasPlaneId() {
+    public boolean hasSlot() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 plane_id = 5;
-     * @return this
-     */
-    public JoinLineupCsReq clearPlaneId() {
-      bitField0_ &= ~0x00000001;
-      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 JoinLineupCsReq setPlaneId(final int value) {
-      bitField0_ |= 0x00000001;
-      planeId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 slot = 6;
-     * @return whether the slot field is set
-     */
-    public boolean hasSlot() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 slot = 6;
+     * optional uint32 slot = 2;
      * @return this
      */
     public JoinLineupCsReq clearSlot() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       slot = 0;
       return this;
     }
 
     /**
-     * optional uint32 slot = 6;
+     * optional uint32 slot = 2;
      * @return the slot
      */
     public int getSlot() {
@@ -127,36 +90,36 @@ public final class JoinLineupCsReqOuterClass {
     }
 
     /**
-     * optional uint32 slot = 6;
+     * optional uint32 slot = 2;
      * @param value the slot to set
      * @return this
      */
     public JoinLineupCsReq setSlot(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       slot = value;
       return this;
     }
 
     /**
-     * optional uint32 index = 11;
+     * optional uint32 index = 3;
      * @return whether the index field is set
      */
     public boolean hasIndex() {
-      return (bitField0_ & 0x00000004) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * optional uint32 index = 11;
+     * optional uint32 index = 3;
      * @return this
      */
     public JoinLineupCsReq clearIndex() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       index = 0;
       return this;
     }
 
     /**
-     * optional uint32 index = 11;
+     * optional uint32 index = 3;
      * @return the index
      */
     public int getIndex() {
@@ -164,36 +127,36 @@ public final class JoinLineupCsReqOuterClass {
     }
 
     /**
-     * optional uint32 index = 11;
+     * optional uint32 index = 3;
      * @param value the index to set
      * @return this
      */
     public JoinLineupCsReq setIndex(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       index = value;
       return this;
     }
 
     /**
-     * optional uint32 base_avatar_id = 12;
+     * optional uint32 base_avatar_id = 11;
      * @return whether the baseAvatarId field is set
      */
     public boolean hasBaseAvatarId() {
-      return (bitField0_ & 0x00000008) != 0;
+      return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional uint32 base_avatar_id = 12;
+     * optional uint32 base_avatar_id = 11;
      * @return this
      */
     public JoinLineupCsReq clearBaseAvatarId() {
-      bitField0_ &= ~0x00000008;
+      bitField0_ &= ~0x00000004;
       baseAvatarId = 0;
       return this;
     }
 
     /**
-     * optional uint32 base_avatar_id = 12;
+     * optional uint32 base_avatar_id = 11;
      * @return the baseAvatarId
      */
     public int getBaseAvatarId() {
@@ -201,98 +164,73 @@ public final class JoinLineupCsReqOuterClass {
     }
 
     /**
-     * optional uint32 base_avatar_id = 12;
+     * optional uint32 base_avatar_id = 11;
      * @param value the baseAvatarId to set
      * @return this
      */
     public JoinLineupCsReq setBaseAvatarId(final int value) {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       baseAvatarId = value;
       return this;
     }
 
     /**
-     * optional .AvatarType avatar_type = 7;
-     * @return whether the avatarType field is set
+     * optional uint32 plane_id = 14;
+     * @return whether the planeId field is set
      */
-    public boolean hasAvatarType() {
+    public boolean hasPlaneId() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * optional uint32 plane_id = 14;
+     * @return this
+     */
+    public JoinLineupCsReq clearPlaneId() {
+      bitField0_ &= ~0x00000008;
+      planeId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 plane_id = 14;
+     * @return the planeId
+     */
+    public int getPlaneId() {
+      return planeId;
+    }
+
+    /**
+     * optional uint32 plane_id = 14;
+     * @param value the planeId to set
+     * @return this
+     */
+    public JoinLineupCsReq setPlaneId(final int value) {
+      bitField0_ |= 0x00000008;
+      planeId = value;
+      return this;
+    }
+
+    /**
+     * optional .ExtraLineupType extra_lineup_type = 9;
+     * @return whether the extraLineupType field is set
+     */
+    public boolean hasExtraLineupType() {
       return (bitField0_ & 0x00000010) != 0;
     }
 
     /**
-     * optional .AvatarType avatar_type = 7;
-     * @return this
-     */
-    public JoinLineupCsReq clearAvatarType() {
-      bitField0_ &= ~0x00000010;
-      avatarType = 0;
-      return this;
-    }
-
-    /**
-     * optional .AvatarType avatar_type = 7;
-     * @return the avatarType
-     */
-    public AvatarTypeOuterClass.AvatarType getAvatarType() {
-      return AvatarTypeOuterClass.AvatarType.forNumber(avatarType);
-    }
-
-    /**
-     * Gets the value of the internal enum store. The result is
-     * equivalent to {@link JoinLineupCsReq#getAvatarType()}.getNumber().
-     *
-     * @return numeric wire representation
-     */
-    public int getAvatarTypeValue() {
-      return avatarType;
-    }
-
-    /**
-     * Sets the value of the internal enum store. This does not
-     * do any validity checks, so be sure to use appropriate value
-     * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value
-     * can cause {@link JoinLineupCsReq#getAvatarType()} to return null
-     *
-     * @param value the numeric wire value to set
-     * @return this
-     */
-    public JoinLineupCsReq setAvatarTypeValue(final int value) {
-      bitField0_ |= 0x00000010;
-      avatarType = value;
-      return this;
-    }
-
-    /**
-     * optional .AvatarType avatar_type = 7;
-     * @param value the avatarType to set
-     * @return this
-     */
-    public JoinLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) {
-      bitField0_ |= 0x00000010;
-      avatarType = value.getNumber();
-      return this;
-    }
-
-    /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
-     * @return whether the extraLineupType field is set
-     */
-    public boolean hasExtraLineupType() {
-      return (bitField0_ & 0x00000020) != 0;
-    }
-
-    /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional .ExtraLineupType extra_lineup_type = 9;
      * @return this
      */
     public JoinLineupCsReq clearExtraLineupType() {
-      bitField0_ &= ~0x00000020;
+      bitField0_ &= ~0x00000010;
       extraLineupType = 0;
       return this;
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional .ExtraLineupType extra_lineup_type = 9;
      * @return the extraLineupType
      */
     public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -319,25 +257,87 @@ public final class JoinLineupCsReqOuterClass {
      * @return this
      */
     public JoinLineupCsReq setExtraLineupTypeValue(final int value) {
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000010;
       extraLineupType = value;
       return this;
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional .ExtraLineupType extra_lineup_type = 9;
      * @param value the extraLineupType to set
      * @return this
      */
     public JoinLineupCsReq setExtraLineupType(
         final ExtraLineupTypeOuterClass.ExtraLineupType value) {
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000010;
       extraLineupType = value.getNumber();
       return this;
     }
 
     /**
-     * optional bool is_virtual = 3;
+     * optional .AvatarType avatar_type = 15;
+     * @return whether the avatarType field is set
+     */
+    public boolean hasAvatarType() {
+      return (bitField0_ & 0x00000020) != 0;
+    }
+
+    /**
+     * optional .AvatarType avatar_type = 15;
+     * @return this
+     */
+    public JoinLineupCsReq clearAvatarType() {
+      bitField0_ &= ~0x00000020;
+      avatarType = 0;
+      return this;
+    }
+
+    /**
+     * optional .AvatarType avatar_type = 15;
+     * @return the avatarType
+     */
+    public AvatarTypeOuterClass.AvatarType getAvatarType() {
+      return AvatarTypeOuterClass.AvatarType.forNumber(avatarType);
+    }
+
+    /**
+     * Gets the value of the internal enum store. The result is
+     * equivalent to {@link JoinLineupCsReq#getAvatarType()}.getNumber().
+     *
+     * @return numeric wire representation
+     */
+    public int getAvatarTypeValue() {
+      return avatarType;
+    }
+
+    /**
+     * Sets the value of the internal enum store. This does not
+     * do any validity checks, so be sure to use appropriate value
+     * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value
+     * can cause {@link JoinLineupCsReq#getAvatarType()} to return null
+     *
+     * @param value the numeric wire value to set
+     * @return this
+     */
+    public JoinLineupCsReq setAvatarTypeValue(final int value) {
+      bitField0_ |= 0x00000020;
+      avatarType = value;
+      return this;
+    }
+
+    /**
+     * optional .AvatarType avatar_type = 15;
+     * @param value the avatarType to set
+     * @return this
+     */
+    public JoinLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) {
+      bitField0_ |= 0x00000020;
+      avatarType = value.getNumber();
+      return this;
+    }
+
+    /**
+     * optional bool is_virtual = 13;
      * @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 = 13;
      * @return this
      */
     public JoinLineupCsReq clearIsVirtual() {
@@ -355,7 +355,7 @@ public final class JoinLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 3;
+     * optional bool is_virtual = 13;
      * @return the isVirtual
      */
     public boolean getIsVirtual() {
@@ -363,7 +363,7 @@ public final class JoinLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 3;
+     * optional bool is_virtual = 13;
      * @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_;
-        planeId = other.planeId;
         slot = other.slot;
         index = other.index;
         baseAvatarId = other.baseAvatarId;
-        avatarType = other.avatarType;
+        planeId = other.planeId;
         extraLineupType = other.extraLineupType;
+        avatarType = other.avatarType;
         isVirtual = other.isVirtual;
       }
       return this;
@@ -395,9 +395,6 @@ public final class JoinLineupCsReqOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasPlaneId()) {
-        setPlaneId(other.planeId);
-      }
       if (other.hasSlot()) {
         setSlot(other.slot);
       }
@@ -407,12 +404,15 @@ public final class JoinLineupCsReqOuterClass {
       if (other.hasBaseAvatarId()) {
         setBaseAvatarId(other.baseAvatarId);
       }
-      if (other.hasAvatarType()) {
-        setAvatarTypeValue(other.avatarType);
+      if (other.hasPlaneId()) {
+        setPlaneId(other.planeId);
       }
       if (other.hasExtraLineupType()) {
         setExtraLineupTypeValue(other.extraLineupType);
       }
+      if (other.hasAvatarType()) {
+        setAvatarTypeValue(other.avatarType);
+      }
       if (other.hasIsVirtual()) {
         setIsVirtual(other.isVirtual);
       }
@@ -426,12 +426,12 @@ public final class JoinLineupCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      planeId = 0;
       slot = 0;
       index = 0;
       baseAvatarId = 0;
-      avatarType = 0;
+      planeId = 0;
       extraLineupType = 0;
+      avatarType = 0;
       isVirtual = false;
       return this;
     }
@@ -456,43 +456,43 @@ public final class JoinLineupCsReqOuterClass {
       }
       JoinLineupCsReq other = (JoinLineupCsReq) o;
       return bitField0_ == other.bitField0_
-        && (!hasPlaneId() || planeId == other.planeId)
         && (!hasSlot() || slot == other.slot)
         && (!hasIndex() || index == other.index)
         && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
-        && (!hasAvatarType() || avatarType == other.avatarType)
+        && (!hasPlaneId() || planeId == other.planeId)
         && (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
+        && (!hasAvatarType() || avatarType == other.avatarType)
         && (!hasIsVirtual() || isVirtual == other.isVirtual);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeUInt32NoTag(planeId);
+        output.writeRawByte((byte) 16);
+        output.writeUInt32NoTag(slot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 48);
-        output.writeUInt32NoTag(slot);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(index);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(index);
-      }
-      if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(baseAvatarId);
       }
-      if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeEnumNoTag(avatarType);
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(planeId);
       }
-      if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 80);
+      if ((bitField0_ & 0x00000010) != 0) {
+        output.writeRawByte((byte) 72);
         output.writeEnumNoTag(extraLineupType);
       }
+      if ((bitField0_ & 0x00000020) != 0) {
+        output.writeRawByte((byte) 120);
+        output.writeEnumNoTag(avatarType);
+      }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 24);
+        output.writeRawByte((byte) 104);
         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(planeId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
+      }
       if ((bitField0_ & 0x00000010) != 0) {
-        size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType);
+        size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
+        size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         size += 2;
@@ -531,18 +531,18 @@ public final class JoinLineupCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
-            // planeId
-            planeId = input.readUInt32();
+          case 16: {
+            // slot
+            slot = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 48) {
+            if (tag != 24) {
               break;
             }
           }
-          case 48: {
-            // slot
-            slot = input.readUInt32();
+          case 24: {
+            // index
+            index = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 88) {
@@ -550,48 +550,48 @@ public final class JoinLineupCsReqOuterClass {
             }
           }
           case 88: {
-            // index
-            index = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 96) {
-              break;
-            }
-          }
-          case 96: {
             // baseAvatarId
             baseAvatarId = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 112) {
+              break;
+            }
+          }
+          case 112: {
+            // planeId
+            planeId = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 72) {
               break;
             }
           }
-          case 56: {
-            // avatarType
-            final int value = input.readInt32();
-            if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
-              avatarType = value;
-              bitField0_ |= 0x00000010;
-            }
-            tag = input.readTag();
-            if (tag != 80) {
-              break;
-            }
-          }
-          case 80: {
+          case 72: {
             // extraLineupType
             final int value = input.readInt32();
             if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
               extraLineupType = value;
-              bitField0_ |= 0x00000020;
+              bitField0_ |= 0x00000010;
             }
             tag = input.readTag();
-            if (tag != 24) {
+            if (tag != 120) {
               break;
             }
           }
-          case 24: {
+          case 120: {
+            // avatarType
+            final int value = input.readInt32();
+            if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
+              avatarType = value;
+              bitField0_ |= 0x00000020;
+            }
+            tag = input.readTag();
+            if (tag != 104) {
+              break;
+            }
+          }
+          case 104: {
             // 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.planeId, planeId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.slot, slot);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.index, index);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeUInt32(FieldNames.planeId, planeId);
+      }
       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.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
+        output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter());
       }
       if ((bitField0_ & 0x00000040) != 0) {
         output.writeBool(FieldNames.isVirtual, isVirtual);
@@ -648,23 +648,11 @@ public final class JoinLineupCsReqOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -493896553:
-          case 1869097438: {
-            if (input.isAtField(FieldNames.planeId)) {
-              if (!input.trySkipNullValue()) {
-                planeId = input.readUInt32();
-                bitField0_ |= 0x00000001;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case 3533310: {
             if (input.isAtField(FieldNames.slot)) {
               if (!input.trySkipNullValue()) {
                 slot = input.readUInt32();
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000001;
               }
             } else {
               input.skipUnknownField();
@@ -675,7 +663,7 @@ public final class JoinLineupCsReqOuterClass {
             if (input.isAtField(FieldNames.index)) {
               if (!input.trySkipNullValue()) {
                 index = input.readUInt32();
-                bitField0_ |= 0x00000004;
+                bitField0_ |= 0x00000002;
               }
             } else {
               input.skipUnknownField();
@@ -687,24 +675,19 @@ public final class JoinLineupCsReqOuterClass {
             if (input.isAtField(FieldNames.baseAvatarId)) {
               if (!input.trySkipNullValue()) {
                 baseAvatarId = input.readUInt32();
-                bitField0_ |= 0x00000008;
+                bitField0_ |= 0x00000004;
               }
             } else {
               input.skipUnknownField();
             }
             break;
           }
-          case -403148749:
-          case 397309536: {
-            if (input.isAtField(FieldNames.avatarType)) {
+          case -493896553:
+          case 1869097438: {
+            if (input.isAtField(FieldNames.planeId)) {
               if (!input.trySkipNullValue()) {
-                final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter());
-                if (value != null) {
-                  avatarType = value.getNumber();
-                  bitField0_ |= 0x00000010;
-                } else {
-                  input.skipUnknownEnumValue();
-                }
+                planeId = input.readUInt32();
+                bitField0_ |= 0x00000008;
               }
             } else {
               input.skipUnknownField();
@@ -718,6 +701,23 @@ public final class JoinLineupCsReqOuterClass {
                 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)) {
+              if (!input.trySkipNullValue()) {
+                final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter());
+                if (value != null) {
+                  avatarType = 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 planeId = FieldName.forField("planeId", "plane_id");
-
       static final FieldName slot = FieldName.forField("slot");
 
       static final FieldName index = FieldName.forField("index");
 
       static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
 
-      static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
+      static final FieldName planeId = FieldName.forField("planeId", "plane_id");
 
       static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
 
+      static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
+
       static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual");
     }
   }
diff --git a/src/generated/main/emu/lunarcore/proto/LanguageTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/LanguageTypeOuterClass.java
index 6d37d8b..d24d57f 100644
--- a/src/generated/main/emu/lunarcore/proto/LanguageTypeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LanguageTypeOuterClass.java
@@ -177,7 +177,7 @@ public final class LanguageTypeOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return LanguageTypeConverter.INSTANCE;
     }
 
@@ -199,7 +199,7 @@ public final class LanguageTypeOuterClass {
       return value == null ? other : value;
     }
 
-    enum LanguageTypeConverter implements EnumConverter {
+    enum LanguageTypeConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       private static final LanguageType[] lookup = new LanguageType[14];
diff --git a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java
index 70103db..43aad4d 100644
--- a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java
@@ -19,14 +19,14 @@ public final class LeaveRogueScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 retcode = 14;
+     * optional uint32 retcode = 1;
      */
     private int retcode;
 
     /**
-     * optional .LineupInfo lineup = 6;
+     * optional .SceneInfo scene = 2;
      */
-    private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+    private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
 
     /**
      * optional .RogueInfo rogue_info = 9;
@@ -34,9 +34,9 @@ public final class LeaveRogueScRspOuterClass {
     private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance();
 
     /**
-     * optional .SceneInfo scene = 12;
+     * optional .LineupInfo lineup = 14;
      */
-    private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
+    private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
 
     private LeaveRogueScRsp() {
     }
@@ -49,7 +49,7 @@ public final class LeaveRogueScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 14;
+     * optional uint32 retcode = 1;
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -57,7 +57,7 @@ public final class LeaveRogueScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 14;
+     * optional uint32 retcode = 1;
      * @return this
      */
     public LeaveRogueScRsp clearRetcode() {
@@ -67,7 +67,7 @@ public final class LeaveRogueScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 14;
+     * optional uint32 retcode = 1;
      * @return the retcode
      */
     public int getRetcode() {
@@ -75,7 +75,7 @@ public final class LeaveRogueScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 14;
+     * optional uint32 retcode = 1;
      * @param value the retcode to set
      * @return this
      */
@@ -86,39 +86,39 @@ public final class LeaveRogueScRspOuterClass {
     }
 
     /**
-     * optional .LineupInfo lineup = 6;
-     * @return whether the lineup field is set
+     * optional .SceneInfo scene = 2;
+     * @return whether the scene field is set
      */
-    public boolean hasLineup() {
+    public boolean hasScene() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * optional .LineupInfo lineup = 6;
+     * optional .SceneInfo scene = 2;
      * @return this
      */
-    public LeaveRogueScRsp clearLineup() {
+    public LeaveRogueScRsp clearScene() {
       bitField0_ &= ~0x00000002;
-      lineup.clear();
+      scene.clear();
       return this;
     }
 
     /**
-     * optional .LineupInfo lineup = 6;
+     * 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.
      *
-     * Use {@link #getMutableLineup()} if you want to modify it.
+     * Use {@link #getMutableScene()} if you want to modify it.
      *
      * @return internal storage object for reading
      */
-    public LineupInfoOuterClass.LineupInfo getLineup() {
-      return lineup;
+    public SceneInfoOuterClass.SceneInfo getScene() {
+      return scene;
     }
 
     /**
-     * optional .LineupInfo lineup = 6;
+     * 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
@@ -126,19 +126,19 @@ public final class LeaveRogueScRspOuterClass {
      *
      * @return internal storage object for modifications
      */
-    public LineupInfoOuterClass.LineupInfo getMutableLineup() {
+    public SceneInfoOuterClass.SceneInfo getMutableScene() {
       bitField0_ |= 0x00000002;
-      return lineup;
+      return scene;
     }
 
     /**
-     * optional .LineupInfo lineup = 6;
-     * @param value the lineup to set
+     * optional .SceneInfo scene = 2;
+     * @param value the scene to set
      * @return this
      */
-    public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
+    public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
       bitField0_ |= 0x00000002;
-      lineup.copyFrom(value);
+      scene.copyFrom(value);
       return this;
     }
 
@@ -200,39 +200,39 @@ public final class LeaveRogueScRspOuterClass {
     }
 
     /**
-     * optional .SceneInfo scene = 12;
-     * @return whether the scene field is set
+     * optional .LineupInfo lineup = 14;
+     * @return whether the lineup field is set
      */
-    public boolean hasScene() {
+    public boolean hasLineup() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * optional .SceneInfo scene = 12;
+     * optional .LineupInfo lineup = 14;
      * @return this
      */
-    public LeaveRogueScRsp clearScene() {
+    public LeaveRogueScRsp clearLineup() {
       bitField0_ &= ~0x00000008;
-      scene.clear();
+      lineup.clear();
       return this;
     }
 
     /**
-     * optional .SceneInfo scene = 12;
+     * optional .LineupInfo lineup = 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 #getMutableScene()} if you want to modify it.
+     * Use {@link #getMutableLineup()} if you want to modify it.
      *
      * @return internal storage object for reading
      */
-    public SceneInfoOuterClass.SceneInfo getScene() {
-      return scene;
+    public LineupInfoOuterClass.LineupInfo getLineup() {
+      return lineup;
     }
 
     /**
-     * optional .SceneInfo scene = 12;
+     * optional .LineupInfo lineup = 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
@@ -240,19 +240,19 @@ public final class LeaveRogueScRspOuterClass {
      *
      * @return internal storage object for modifications
      */
-    public SceneInfoOuterClass.SceneInfo getMutableScene() {
+    public LineupInfoOuterClass.LineupInfo getMutableLineup() {
       bitField0_ |= 0x00000008;
-      return scene;
+      return lineup;
     }
 
     /**
-     * optional .SceneInfo scene = 12;
-     * @param value the scene to set
+     * optional .LineupInfo lineup = 14;
+     * @param value the lineup to set
      * @return this
      */
-    public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
+    public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
       bitField0_ |= 0x00000008;
-      scene.copyFrom(value);
+      lineup.copyFrom(value);
       return this;
     }
 
@@ -262,9 +262,9 @@ public final class LeaveRogueScRspOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         retcode = other.retcode;
-        lineup.copyFrom(other.lineup);
-        rogueInfo.copyFrom(other.rogueInfo);
         scene.copyFrom(other.scene);
+        rogueInfo.copyFrom(other.rogueInfo);
+        lineup.copyFrom(other.lineup);
       }
       return this;
     }
@@ -278,14 +278,14 @@ public final class LeaveRogueScRspOuterClass {
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
-      if (other.hasLineup()) {
-        getMutableLineup().mergeFrom(other.lineup);
+      if (other.hasScene()) {
+        getMutableScene().mergeFrom(other.scene);
       }
       if (other.hasRogueInfo()) {
         getMutableRogueInfo().mergeFrom(other.rogueInfo);
       }
-      if (other.hasScene()) {
-        getMutableScene().mergeFrom(other.scene);
+      if (other.hasLineup()) {
+        getMutableLineup().mergeFrom(other.lineup);
       }
       return this;
     }
@@ -298,9 +298,9 @@ public final class LeaveRogueScRspOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       retcode = 0;
-      lineup.clear();
-      rogueInfo.clear();
       scene.clear();
+      rogueInfo.clear();
+      lineup.clear();
       return this;
     }
 
@@ -311,9 +311,9 @@ public final class LeaveRogueScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      lineup.clearQuick();
-      rogueInfo.clearQuick();
       scene.clearQuick();
+      rogueInfo.clearQuick();
+      lineup.clearQuick();
       return this;
     }
 
@@ -328,28 +328,28 @@ public final class LeaveRogueScRspOuterClass {
       LeaveRogueScRsp other = (LeaveRogueScRsp) o;
       return bitField0_ == other.bitField0_
         && (!hasRetcode() || retcode == other.retcode)
-        && (!hasLineup() || lineup.equals(other.lineup))
+        && (!hasScene() || scene.equals(other.scene))
         && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo))
-        && (!hasScene() || scene.equals(other.scene));
+        && (!hasLineup() || lineup.equals(other.lineup));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 112);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 50);
-        output.writeMessageNoTag(lineup);
+        output.writeRawByte((byte) 18);
+        output.writeMessageNoTag(scene);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 74);
         output.writeMessageNoTag(rogueInfo);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 98);
-        output.writeMessageNoTag(scene);
+        output.writeRawByte((byte) 114);
+        output.writeMessageNoTag(lineup);
       }
     }
 
@@ -360,13 +360,13 @@ public final class LeaveRogueScRspOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
       }
       return size;
     }
@@ -378,18 +378,18 @@ public final class LeaveRogueScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 112: {
+          case 8: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 50) {
+            if (tag != 18) {
               break;
             }
           }
-          case 50: {
-            // lineup
-            input.readMessage(lineup);
+          case 18: {
+            // scene
+            input.readMessage(scene);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 74) {
@@ -401,13 +401,13 @@ public final class LeaveRogueScRspOuterClass {
             input.readMessage(rogueInfo);
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 98) {
+            if (tag != 114) {
               break;
             }
           }
-          case 98: {
-            // scene
-            input.readMessage(scene);
+          case 114: {
+            // lineup
+            input.readMessage(lineup);
             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.lineup, lineup);
+        output.writeMessage(FieldNames.scene, scene);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeMessage(FieldNames.rogueInfo, rogueInfo);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeMessage(FieldNames.scene, scene);
+        output.writeMessage(FieldNames.lineup, lineup);
       }
       output.endObject();
     }
@@ -464,10 +464,10 @@ public final class LeaveRogueScRspOuterClass {
             }
             break;
           }
-          case -1102671473: {
-            if (input.isAtField(FieldNames.lineup)) {
+          case 109254796: {
+            if (input.isAtField(FieldNames.scene)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(lineup);
+                input.readMessage(scene);
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -487,10 +487,10 @@ public final class LeaveRogueScRspOuterClass {
             }
             break;
           }
-          case 109254796: {
-            if (input.isAtField(FieldNames.scene)) {
+          case -1102671473: {
+            if (input.isAtField(FieldNames.lineup)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(scene);
+                input.readMessage(lineup);
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -553,11 +553,11 @@ public final class LeaveRogueScRspOuterClass {
     static class FieldNames {
       static final FieldName retcode = FieldName.forField("retcode");
 
-      static final FieldName lineup = FieldName.forField("lineup");
+      static final FieldName scene = FieldName.forField("scene");
 
       static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info");
 
-      static final FieldName scene = FieldName.forField("scene");
+      static final FieldName lineup = FieldName.forField("lineup");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java
index deb55cb..45c2124 100644
--- a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java
@@ -19,32 +19,32 @@ public final class LineupAvatarOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 hp = 2;
-     */
-    private int hp;
-
-    /**
-     * optional uint32 satiety = 9;
-     */
-    private int satiety;
-
-    /**
-     * optional uint32 id = 11;
-     */
-    private int id;
-
-    /**
-     * optional uint32 slot = 13;
+     * optional uint32 slot = 5;
      */
     private int slot;
 
     /**
-     * optional .AvatarType avatar_type = 12;
+     * optional uint32 hp = 6;
+     */
+    private int hp;
+
+    /**
+     * optional uint32 id = 8;
+     */
+    private int id;
+
+    /**
+     * optional uint32 satiety = 15;
+     */
+    private int satiety;
+
+    /**
+     * optional .AvatarType avatar_type = 1;
      */
     private int avatarType;
 
     /**
-     * optional .SpBarInfo sp_bar = 7;
+     * optional .SpBarInfo sp_bar = 14;
      */
     private final SpBarInfoOuterClass.SpBarInfo spBar = SpBarInfoOuterClass.SpBarInfo.newInstance();
 
@@ -59,25 +59,62 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional uint32 hp = 2;
-     * @return whether the hp field is set
+     * optional uint32 slot = 5;
+     * @return whether the slot field is set
      */
-    public boolean hasHp() {
+    public boolean hasSlot() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 hp = 2;
+     * optional uint32 slot = 5;
+     * @return this
+     */
+    public LineupAvatar clearSlot() {
+      bitField0_ &= ~0x00000001;
+      slot = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 slot = 5;
+     * @return the slot
+     */
+    public int getSlot() {
+      return slot;
+    }
+
+    /**
+     * optional uint32 slot = 5;
+     * @param value the slot to set
+     * @return this
+     */
+    public LineupAvatar setSlot(final int value) {
+      bitField0_ |= 0x00000001;
+      slot = 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;
      * @return this
      */
     public LineupAvatar clearHp() {
-      bitField0_ &= ~0x00000001;
+      bitField0_ &= ~0x00000002;
       hp = 0;
       return this;
     }
 
     /**
-     * optional uint32 hp = 2;
+     * optional uint32 hp = 6;
      * @return the hp
      */
     public int getHp() {
@@ -85,55 +122,18 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional uint32 hp = 2;
+     * optional uint32 hp = 6;
      * @param value the hp to set
      * @return this
      */
     public LineupAvatar setHp(final int value) {
-      bitField0_ |= 0x00000001;
+      bitField0_ |= 0x00000002;
       hp = value;
       return this;
     }
 
     /**
-     * optional uint32 satiety = 9;
-     * @return whether the satiety field is set
-     */
-    public boolean hasSatiety() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 satiety = 9;
-     * @return this
-     */
-    public LineupAvatar clearSatiety() {
-      bitField0_ &= ~0x00000002;
-      satiety = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 satiety = 9;
-     * @return the satiety
-     */
-    public int getSatiety() {
-      return satiety;
-    }
-
-    /**
-     * optional uint32 satiety = 9;
-     * @param value the satiety to set
-     * @return this
-     */
-    public LineupAvatar setSatiety(final int value) {
-      bitField0_ |= 0x00000002;
-      satiety = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 id = 11;
+     * optional uint32 id = 8;
      * @return whether the id field is set
      */
     public boolean hasId() {
@@ -141,7 +141,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional uint32 id = 11;
+     * optional uint32 id = 8;
      * @return this
      */
     public LineupAvatar clearId() {
@@ -151,7 +151,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional uint32 id = 11;
+     * optional uint32 id = 8;
      * @return the id
      */
     public int getId() {
@@ -159,7 +159,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional uint32 id = 11;
+     * optional uint32 id = 8;
      * @param value the id to set
      * @return this
      */
@@ -170,44 +170,44 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional uint32 slot = 13;
-     * @return whether the slot field is set
+     * optional uint32 satiety = 15;
+     * @return whether the satiety field is set
      */
-    public boolean hasSlot() {
+    public boolean hasSatiety() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * optional uint32 slot = 13;
+     * optional uint32 satiety = 15;
      * @return this
      */
-    public LineupAvatar clearSlot() {
+    public LineupAvatar clearSatiety() {
       bitField0_ &= ~0x00000008;
-      slot = 0;
+      satiety = 0;
       return this;
     }
 
     /**
-     * optional uint32 slot = 13;
-     * @return the slot
+     * optional uint32 satiety = 15;
+     * @return the satiety
      */
-    public int getSlot() {
-      return slot;
+    public int getSatiety() {
+      return satiety;
     }
 
     /**
-     * optional uint32 slot = 13;
-     * @param value the slot to set
+     * optional uint32 satiety = 15;
+     * @param value the satiety to set
      * @return this
      */
-    public LineupAvatar setSlot(final int value) {
+    public LineupAvatar setSatiety(final int value) {
       bitField0_ |= 0x00000008;
-      slot = value;
+      satiety = value;
       return this;
     }
 
     /**
-     * optional .AvatarType avatar_type = 12;
+     * optional .AvatarType avatar_type = 1;
      * @return whether the avatarType field is set
      */
     public boolean hasAvatarType() {
@@ -215,7 +215,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional .AvatarType avatar_type = 12;
+     * optional .AvatarType avatar_type = 1;
      * @return this
      */
     public LineupAvatar clearAvatarType() {
@@ -225,7 +225,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional .AvatarType avatar_type = 12;
+     * optional .AvatarType avatar_type = 1;
      * @return the avatarType
      */
     public AvatarTypeOuterClass.AvatarType getAvatarType() {
@@ -258,7 +258,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional .AvatarType avatar_type = 12;
+     * optional .AvatarType avatar_type = 1;
      * @param value the avatarType to set
      * @return this
      */
@@ -269,7 +269,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional .SpBarInfo sp_bar = 7;
+     * optional .SpBarInfo sp_bar = 14;
      * @return whether the spBar field is set
      */
     public boolean hasSpBar() {
@@ -277,7 +277,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional .SpBarInfo sp_bar = 7;
+     * optional .SpBarInfo sp_bar = 14;
      * @return this
      */
     public LineupAvatar clearSpBar() {
@@ -287,7 +287,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional .SpBarInfo sp_bar = 7;
+     * optional .SpBarInfo sp_bar = 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.
@@ -301,7 +301,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional .SpBarInfo sp_bar = 7;
+     * optional .SpBarInfo sp_bar = 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
@@ -315,7 +315,7 @@ public final class LineupAvatarOuterClass {
     }
 
     /**
-     * optional .SpBarInfo sp_bar = 7;
+     * optional .SpBarInfo sp_bar = 14;
      * @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_;
-        hp = other.hp;
-        satiety = other.satiety;
-        id = other.id;
         slot = other.slot;
+        hp = other.hp;
+        id = other.id;
+        satiety = other.satiety;
         avatarType = other.avatarType;
         spBar.copyFrom(other.spBar);
       }
@@ -346,17 +346,17 @@ public final class LineupAvatarOuterClass {
         return this;
       }
       cachedSize = -1;
+      if (other.hasSlot()) {
+        setSlot(other.slot);
+      }
       if (other.hasHp()) {
         setHp(other.hp);
       }
-      if (other.hasSatiety()) {
-        setSatiety(other.satiety);
-      }
       if (other.hasId()) {
         setId(other.id);
       }
-      if (other.hasSlot()) {
-        setSlot(other.slot);
+      if (other.hasSatiety()) {
+        setSatiety(other.satiety);
       }
       if (other.hasAvatarType()) {
         setAvatarTypeValue(other.avatarType);
@@ -374,10 +374,10 @@ public final class LineupAvatarOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      hp = 0;
-      satiety = 0;
-      id = 0;
       slot = 0;
+      hp = 0;
+      id = 0;
+      satiety = 0;
       avatarType = 0;
       spBar.clear();
       return this;
@@ -404,10 +404,10 @@ public final class LineupAvatarOuterClass {
       }
       LineupAvatar other = (LineupAvatar) o;
       return bitField0_ == other.bitField0_
-        && (!hasHp() || hp == other.hp)
-        && (!hasSatiety() || satiety == other.satiety)
-        && (!hasId() || id == other.id)
         && (!hasSlot() || slot == other.slot)
+        && (!hasHp() || hp == other.hp)
+        && (!hasId() || id == other.id)
+        && (!hasSatiety() || satiety == other.satiety)
         && (!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(hp);
+        output.writeRawByte((byte) 40);
+        output.writeUInt32NoTag(slot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(satiety);
+        output.writeRawByte((byte) 48);
+        output.writeUInt32NoTag(hp);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(id);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 104);
-        output.writeUInt32NoTag(slot);
+        output.writeRawByte((byte) 120);
+        output.writeUInt32NoTag(satiety);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 8);
         output.writeEnumNoTag(avatarType);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 58);
+        output.writeRawByte((byte) 114);
         output.writeMessageNoTag(spBar);
       }
     }
@@ -444,16 +444,16 @@ public final class LineupAvatarOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(hp);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(satiety);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(hp);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(satiety);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType);
@@ -471,43 +471,43 @@ public final class LineupAvatarOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
-            // hp
-            hp = input.readUInt32();
+          case 40: {
+            // slot
+            slot = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 72) {
+            if (tag != 48) {
               break;
             }
           }
-          case 72: {
-            // satiety
-            satiety = input.readUInt32();
+          case 48: {
+            // hp
+            hp = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 64) {
               break;
             }
           }
-          case 88: {
+          case 64: {
             // id
             id = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 120) {
               break;
             }
           }
-          case 104: {
-            // slot
-            slot = input.readUInt32();
+          case 120: {
+            // satiety
+            satiety = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 8) {
               break;
             }
           }
-          case 96: {
+          case 8: {
             // 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 != 58) {
+            if (tag != 114) {
               break;
             }
           }
-          case 58: {
+          case 114: {
             // spBar
             input.readMessage(spBar);
             bitField0_ |= 0x00000020;
@@ -546,16 +546,16 @@ public final class LineupAvatarOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.hp, hp);
+        output.writeUInt32(FieldNames.slot, slot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.satiety, satiety);
+        output.writeUInt32(FieldNames.hp, hp);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.id, id);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.slot, slot);
+        output.writeUInt32(FieldNames.satiety, satiety);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter());
@@ -573,10 +573,10 @@ public final class LineupAvatarOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 3336: {
-            if (input.isAtField(FieldNames.hp)) {
+          case 3533310: {
+            if (input.isAtField(FieldNames.slot)) {
               if (!input.trySkipNullValue()) {
-                hp = input.readUInt32();
+                slot = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -584,10 +584,10 @@ public final class LineupAvatarOuterClass {
             }
             break;
           }
-          case 1871093127: {
-            if (input.isAtField(FieldNames.satiety)) {
+          case 3336: {
+            if (input.isAtField(FieldNames.hp)) {
               if (!input.trySkipNullValue()) {
-                satiety = input.readUInt32();
+                hp = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -606,10 +606,10 @@ public final class LineupAvatarOuterClass {
             }
             break;
           }
-          case 3533310: {
-            if (input.isAtField(FieldNames.slot)) {
+          case 1871093127: {
+            if (input.isAtField(FieldNames.satiety)) {
               if (!input.trySkipNullValue()) {
-                slot = input.readUInt32();
+                satiety = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -698,13 +698,13 @@ public final class LineupAvatarOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName hp = FieldName.forField("hp");
+      static final FieldName slot = FieldName.forField("slot");
 
-      static final FieldName satiety = FieldName.forField("satiety");
+      static final FieldName hp = FieldName.forField("hp");
 
       static final FieldName id = FieldName.forField("id");
 
-      static final FieldName slot = FieldName.forField("slot");
+      static final FieldName satiety = FieldName.forField("satiety");
 
       static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
 
diff --git a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java
index 1d59eb5..d76e563 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 plane_id = 3;
-     */
-    private int planeId;
-
-    /**
-     * optional uint32 mp = 4;
-     */
-    private int mp;
-
-    /**
-     * optional uint32 index = 7;
+     * optional uint32 index = 3;
      */
     private int index;
 
     /**
-     * optional uint32 leader_slot = 11;
+     * optional uint32 mp = 6;
      */
-    private int leaderSlot;
+    private int mp;
 
     /**
-     * optional uint32 max_mp = 14;
+     * optional uint32 max_mp = 8;
      */
     private int maxMp;
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 6;
+     * optional uint32 plane_id = 10;
+     */
+    private int planeId;
+
+    /**
+     * optional uint32 leader_slot = 13;
+     */
+    private int leaderSlot;
+
+    /**
+     * optional .ExtraLineupType extra_lineup_type = 7;
      */
     private int extraLineupType;
 
     /**
-     * optional bool is_virtual = 10;
+     * optional bool is_virtual = 15;
      */
     private boolean isVirtual;
 
     /**
-     * optional string name = 1;
+     * optional string name = 14;
      */
     private final Utf8String name = Utf8String.newEmptyInstance();
 
     /**
-     * repeated .LineupAvatar avatar_list = 5;
+     * repeated .LineupAvatar avatar_list = 2;
      */
     private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(LineupAvatarOuterClass.LineupAvatar.getFactory());
 
@@ -76,44 +76,44 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional uint32 plane_id = 3;
-     * @return whether the planeId field is set
+     * optional uint32 index = 3;
+     * @return whether the index field is set
      */
-    public boolean hasPlaneId() {
+    public boolean hasIndex() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 plane_id = 3;
+     * optional uint32 index = 3;
      * @return this
      */
-    public LineupInfo clearPlaneId() {
+    public LineupInfo clearIndex() {
       bitField0_ &= ~0x00000001;
-      planeId = 0;
+      index = 0;
       return this;
     }
 
     /**
-     * optional uint32 plane_id = 3;
-     * @return the planeId
+     * optional uint32 index = 3;
+     * @return the index
      */
-    public int getPlaneId() {
-      return planeId;
+    public int getIndex() {
+      return index;
     }
 
     /**
-     * optional uint32 plane_id = 3;
-     * @param value the planeId to set
+     * optional uint32 index = 3;
+     * @param value the index to set
      * @return this
      */
-    public LineupInfo setPlaneId(final int value) {
+    public LineupInfo setIndex(final int value) {
       bitField0_ |= 0x00000001;
-      planeId = value;
+      index = value;
       return this;
     }
 
     /**
-     * optional uint32 mp = 4;
+     * optional uint32 mp = 6;
      * @return whether the mp field is set
      */
     public boolean hasMp() {
@@ -121,7 +121,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional uint32 mp = 4;
+     * optional uint32 mp = 6;
      * @return this
      */
     public LineupInfo clearMp() {
@@ -131,7 +131,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional uint32 mp = 4;
+     * optional uint32 mp = 6;
      * @return the mp
      */
     public int getMp() {
@@ -139,7 +139,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional uint32 mp = 4;
+     * optional uint32 mp = 6;
      * @param value the mp to set
      * @return this
      */
@@ -150,99 +150,25 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional uint32 index = 7;
-     * @return whether the index field is set
+     * optional uint32 max_mp = 8;
+     * @return whether the maxMp field is set
      */
-    public boolean hasIndex() {
+    public boolean hasMaxMp() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional uint32 index = 7;
-     * @return this
-     */
-    public LineupInfo clearIndex() {
-      bitField0_ &= ~0x00000004;
-      index = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 index = 7;
-     * @return the index
-     */
-    public int getIndex() {
-      return index;
-    }
-
-    /**
-     * optional uint32 index = 7;
-     * @param value the index to set
-     * @return this
-     */
-    public LineupInfo setIndex(final int value) {
-      bitField0_ |= 0x00000004;
-      index = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 leader_slot = 11;
-     * @return whether the leaderSlot field is set
-     */
-    public boolean hasLeaderSlot() {
-      return (bitField0_ & 0x00000008) != 0;
-    }
-
-    /**
-     * optional uint32 leader_slot = 11;
-     * @return this
-     */
-    public LineupInfo clearLeaderSlot() {
-      bitField0_ &= ~0x00000008;
-      leaderSlot = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 leader_slot = 11;
-     * @return the leaderSlot
-     */
-    public int getLeaderSlot() {
-      return leaderSlot;
-    }
-
-    /**
-     * optional uint32 leader_slot = 11;
-     * @param value the leaderSlot to set
-     * @return this
-     */
-    public LineupInfo setLeaderSlot(final int value) {
-      bitField0_ |= 0x00000008;
-      leaderSlot = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 max_mp = 14;
-     * @return whether the maxMp field is set
-     */
-    public boolean hasMaxMp() {
-      return (bitField0_ & 0x00000010) != 0;
-    }
-
-    /**
-     * optional uint32 max_mp = 14;
+     * optional uint32 max_mp = 8;
      * @return this
      */
     public LineupInfo clearMaxMp() {
-      bitField0_ &= ~0x00000010;
+      bitField0_ &= ~0x00000004;
       maxMp = 0;
       return this;
     }
 
     /**
-     * optional uint32 max_mp = 14;
+     * optional uint32 max_mp = 8;
      * @return the maxMp
      */
     public int getMaxMp() {
@@ -250,18 +176,92 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional uint32 max_mp = 14;
+     * optional uint32 max_mp = 8;
      * @param value the maxMp to set
      * @return this
      */
     public LineupInfo setMaxMp(final int value) {
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000004;
       maxMp = value;
       return this;
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 6;
+     * optional uint32 plane_id = 10;
+     * @return whether the planeId field is set
+     */
+    public boolean hasPlaneId() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * optional uint32 plane_id = 10;
+     * @return this
+     */
+    public LineupInfo clearPlaneId() {
+      bitField0_ &= ~0x00000008;
+      planeId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 plane_id = 10;
+     * @return the planeId
+     */
+    public int getPlaneId() {
+      return planeId;
+    }
+
+    /**
+     * optional uint32 plane_id = 10;
+     * @param value the planeId to set
+     * @return this
+     */
+    public LineupInfo setPlaneId(final int value) {
+      bitField0_ |= 0x00000008;
+      planeId = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 leader_slot = 13;
+     * @return whether the leaderSlot field is set
+     */
+    public boolean hasLeaderSlot() {
+      return (bitField0_ & 0x00000010) != 0;
+    }
+
+    /**
+     * optional uint32 leader_slot = 13;
+     * @return this
+     */
+    public LineupInfo clearLeaderSlot() {
+      bitField0_ &= ~0x00000010;
+      leaderSlot = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 leader_slot = 13;
+     * @return the leaderSlot
+     */
+    public int getLeaderSlot() {
+      return leaderSlot;
+    }
+
+    /**
+     * optional uint32 leader_slot = 13;
+     * @param value the leaderSlot to set
+     * @return this
+     */
+    public LineupInfo setLeaderSlot(final int value) {
+      bitField0_ |= 0x00000010;
+      leaderSlot = value;
+      return this;
+    }
+
+    /**
+     * optional .ExtraLineupType extra_lineup_type = 7;
      * @return whether the extraLineupType field is set
      */
     public boolean hasExtraLineupType() {
@@ -269,7 +269,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 6;
+     * optional .ExtraLineupType extra_lineup_type = 7;
      * @return this
      */
     public LineupInfo clearExtraLineupType() {
@@ -279,7 +279,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 6;
+     * optional .ExtraLineupType extra_lineup_type = 7;
      * @return the extraLineupType
      */
     public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -312,7 +312,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 6;
+     * optional .ExtraLineupType extra_lineup_type = 7;
      * @param value the extraLineupType to set
      * @return this
      */
@@ -323,7 +323,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 10;
+     * optional bool is_virtual = 15;
      * @return whether the isVirtual field is set
      */
     public boolean hasIsVirtual() {
@@ -331,7 +331,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 10;
+     * optional bool is_virtual = 15;
      * @return this
      */
     public LineupInfo clearIsVirtual() {
@@ -341,7 +341,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 10;
+     * optional bool is_virtual = 15;
      * @return the isVirtual
      */
     public boolean getIsVirtual() {
@@ -349,7 +349,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 10;
+     * optional bool is_virtual = 15;
      * @param value the isVirtual to set
      * @return this
      */
@@ -360,7 +360,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional string name = 1;
+     * optional string name = 14;
      * @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 = 14;
      * @return this
      */
     public LineupInfo clearName() {
@@ -378,7 +378,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional string name = 1;
+     * optional string name = 14;
      * @return the name
      */
     public String getName() {
@@ -386,7 +386,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional string name = 1;
+     * optional string name = 14;
      * @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 = 14;
      * @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 = 14;
      * @param value the name to set
      * @return this
      */
@@ -414,7 +414,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * optional string name = 1;
+     * optional string name = 14;
      * @param value the name to set
      * @return this
      */
@@ -425,7 +425,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * repeated .LineupAvatar avatar_list = 5;
+     * repeated .LineupAvatar avatar_list = 2;
      * @return whether the avatarList field is set
      */
     public boolean hasAvatarList() {
@@ -433,7 +433,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * repeated .LineupAvatar avatar_list = 5;
+     * repeated .LineupAvatar avatar_list = 2;
      * @return this
      */
     public LineupInfo clearAvatarList() {
@@ -443,7 +443,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * repeated .LineupAvatar avatar_list = 5;
+     * repeated .LineupAvatar avatar_list = 2;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -457,7 +457,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * repeated .LineupAvatar avatar_list = 5;
+     * repeated .LineupAvatar avatar_list = 2;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -471,7 +471,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * repeated .LineupAvatar avatar_list = 5;
+     * repeated .LineupAvatar avatar_list = 2;
      * @param value the avatarList to add
      * @return this
      */
@@ -482,7 +482,7 @@ public final class LineupInfoOuterClass {
     }
 
     /**
-     * repeated .LineupAvatar avatar_list = 5;
+     * repeated .LineupAvatar avatar_list = 2;
      * @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_;
-        planeId = other.planeId;
-        mp = other.mp;
         index = other.index;
-        leaderSlot = other.leaderSlot;
+        mp = other.mp;
         maxMp = other.maxMp;
+        planeId = other.planeId;
+        leaderSlot = other.leaderSlot;
         extraLineupType = other.extraLineupType;
         isVirtual = other.isVirtual;
         name.copyFrom(other.name);
@@ -516,21 +516,21 @@ public final class LineupInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasPlaneId()) {
-        setPlaneId(other.planeId);
+      if (other.hasIndex()) {
+        setIndex(other.index);
       }
       if (other.hasMp()) {
         setMp(other.mp);
       }
-      if (other.hasIndex()) {
-        setIndex(other.index);
+      if (other.hasMaxMp()) {
+        setMaxMp(other.maxMp);
+      }
+      if (other.hasPlaneId()) {
+        setPlaneId(other.planeId);
       }
       if (other.hasLeaderSlot()) {
         setLeaderSlot(other.leaderSlot);
       }
-      if (other.hasMaxMp()) {
-        setMaxMp(other.maxMp);
-      }
       if (other.hasExtraLineupType()) {
         setExtraLineupTypeValue(other.extraLineupType);
       }
@@ -553,11 +553,11 @@ public final class LineupInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      planeId = 0;
-      mp = 0;
       index = 0;
-      leaderSlot = 0;
+      mp = 0;
       maxMp = 0;
+      planeId = 0;
+      leaderSlot = 0;
       extraLineupType = 0;
       isVirtual = false;
       name.clear();
@@ -587,11 +587,11 @@ public final class LineupInfoOuterClass {
       }
       LineupInfo other = (LineupInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasPlaneId() || planeId == other.planeId)
-        && (!hasMp() || mp == other.mp)
         && (!hasIndex() || index == other.index)
-        && (!hasLeaderSlot() || leaderSlot == other.leaderSlot)
+        && (!hasMp() || mp == other.mp)
         && (!hasMaxMp() || maxMp == other.maxMp)
+        && (!hasPlaneId() || planeId == other.planeId)
+        && (!hasLeaderSlot() || leaderSlot == other.leaderSlot)
         && (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
         && (!hasIsVirtual() || isVirtual == other.isVirtual)
         && (!hasName() || name.equals(other.name))
@@ -602,39 +602,39 @@ public final class LineupInfoOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         output.writeRawByte((byte) 24);
-        output.writeUInt32NoTag(planeId);
+        output.writeUInt32NoTag(index);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(mp);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(index);
-      }
-      if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(leaderSlot);
-      }
-      if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 112);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(maxMp);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(planeId);
+      }
+      if ((bitField0_ & 0x00000010) != 0) {
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(leaderSlot);
+      }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 48);
+        output.writeRawByte((byte) 56);
         output.writeEnumNoTag(extraLineupType);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 120);
         output.writeBoolNoTag(isVirtual);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        output.writeRawByte((byte) 10);
+        output.writeRawByte((byte) 114);
         output.writeStringNoTag(name);
       }
       if ((bitField0_ & 0x00000100) != 0) {
         for (int i = 0; i < avatarList.length(); i++) {
-          output.writeRawByte((byte) 42);
+          output.writeRawByte((byte) 18);
           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(planeId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(mp);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
@@ -681,51 +681,51 @@ public final class LineupInfoOuterClass {
       while (true) {
         switch (tag) {
           case 24: {
-            // planeId
-            planeId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 32) {
-              break;
-            }
-          }
-          case 32: {
-            // mp
-            mp = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 56) {
-              break;
-            }
-          }
-          case 56: {
             // index
             index = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
-            // leaderSlot
-            leaderSlot = input.readUInt32();
-            bitField0_ |= 0x00000008;
-            tag = input.readTag();
-            if (tag != 112) {
-              break;
-            }
-          }
-          case 112: {
-            // maxMp
-            maxMp = input.readUInt32();
-            bitField0_ |= 0x00000010;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
             if (tag != 48) {
               break;
             }
           }
           case 48: {
+            // mp
+            mp = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 64) {
+              break;
+            }
+          }
+          case 64: {
+            // maxMp
+            maxMp = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 80) {
+              break;
+            }
+          }
+          case 80: {
+            // planeId
+            planeId = input.readUInt32();
+            bitField0_ |= 0x00000008;
+            tag = input.readTag();
+            if (tag != 104) {
+              break;
+            }
+          }
+          case 104: {
+            // leaderSlot
+            leaderSlot = input.readUInt32();
+            bitField0_ |= 0x00000010;
+            tag = input.readTag();
+            if (tag != 56) {
+              break;
+            }
+          }
+          case 56: {
             // 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 != 80) {
+            if (tag != 120) {
               break;
             }
           }
-          case 80: {
+          case 120: {
             // isVirtual
             isVirtual = input.readBool();
             bitField0_ |= 0x00000040;
             tag = input.readTag();
-            if (tag != 10) {
+            if (tag != 114) {
               break;
             }
           }
-          case 10: {
+          case 114: {
             // name
             input.readString(name);
             bitField0_ |= 0x00000080;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 18) {
               break;
             }
           }
-          case 42: {
+          case 18: {
             // 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.planeId, planeId);
+        output.writeUInt32(FieldNames.index, index);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.mp, mp);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.index, index);
+        output.writeUInt32(FieldNames.maxMp, maxMp);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.leaderSlot, leaderSlot);
+        output.writeUInt32(FieldNames.planeId, planeId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeUInt32(FieldNames.maxMp, maxMp);
+        output.writeUInt32(FieldNames.leaderSlot, leaderSlot);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
@@ -817,11 +817,10 @@ public final class LineupInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          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_ |= 0x00000001;
               }
             } else {
@@ -840,10 +839,11 @@ public final class LineupInfoOuterClass {
             }
             break;
           }
-          case 100346066: {
-            if (input.isAtField(FieldNames.index)) {
+          case 103671335:
+          case -1081138594: {
+            if (input.isAtField(FieldNames.maxMp)) {
               if (!input.trySkipNullValue()) {
-                index = input.readUInt32();
+                maxMp = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -851,23 +851,23 @@ public final class LineupInfoOuterClass {
             }
             break;
           }
+          case -493896553:
+          case 1869097438: {
+            if (input.isAtField(FieldNames.planeId)) {
+              if (!input.trySkipNullValue()) {
+                planeId = input.readUInt32();
+                bitField0_ |= 0x00000008;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           case 1191442087:
           case -1708713100: {
             if (input.isAtField(FieldNames.leaderSlot)) {
               if (!input.trySkipNullValue()) {
                 leaderSlot = input.readUInt32();
-                bitField0_ |= 0x00000008;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case 103671335:
-          case -1081138594: {
-            if (input.isAtField(FieldNames.maxMp)) {
-              if (!input.trySkipNullValue()) {
-                maxMp = input.readUInt32();
                 bitField0_ |= 0x00000010;
               }
             } else {
@@ -979,16 +979,16 @@ public final class LineupInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName planeId = FieldName.forField("planeId", "plane_id");
+      static final FieldName index = FieldName.forField("index");
 
       static final FieldName mp = FieldName.forField("mp");
 
-      static final FieldName index = FieldName.forField("index");
+      static final FieldName maxMp = FieldName.forField("maxMp", "max_mp");
+
+      static final FieldName planeId = FieldName.forField("planeId", "plane_id");
 
       static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot");
 
-      static final FieldName maxMp = FieldName.forField("maxMp", "max_mp");
-
       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/LineupSlotDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java
index 47d9a93..ab7236f 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 id = 5;
+     * optional uint32 id = 10;
      */
     private int id;
 
     /**
-     * optional uint32 slot = 14;
+     * optional uint32 slot = 13;
      */
     private int slot;
 
     /**
-     * optional .AvatarType avatar_type = 8;
+     * optional .AvatarType avatar_type = 11;
      */
     private int avatarType;
 
@@ -44,7 +44,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional uint32 id = 5;
+     * optional uint32 id = 10;
      * @return whether the id field is set
      */
     public boolean hasId() {
@@ -52,7 +52,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional uint32 id = 5;
+     * optional uint32 id = 10;
      * @return this
      */
     public LineupSlotData clearId() {
@@ -62,7 +62,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional uint32 id = 5;
+     * optional uint32 id = 10;
      * @return the id
      */
     public int getId() {
@@ -70,7 +70,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional uint32 id = 5;
+     * optional uint32 id = 10;
      * @param value the id to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional uint32 slot = 14;
+     * optional uint32 slot = 13;
      * @return whether the slot field is set
      */
     public boolean hasSlot() {
@@ -89,7 +89,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional uint32 slot = 14;
+     * optional uint32 slot = 13;
      * @return this
      */
     public LineupSlotData clearSlot() {
@@ -99,7 +99,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional uint32 slot = 14;
+     * optional uint32 slot = 13;
      * @return the slot
      */
     public int getSlot() {
@@ -107,7 +107,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional uint32 slot = 14;
+     * optional uint32 slot = 13;
      * @param value the slot to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional .AvatarType avatar_type = 8;
+     * optional .AvatarType avatar_type = 11;
      * @return whether the avatarType field is set
      */
     public boolean hasAvatarType() {
@@ -126,7 +126,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional .AvatarType avatar_type = 8;
+     * optional .AvatarType avatar_type = 11;
      * @return this
      */
     public LineupSlotData clearAvatarType() {
@@ -136,7 +136,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional .AvatarType avatar_type = 8;
+     * optional .AvatarType avatar_type = 11;
      * @return the avatarType
      */
     public AvatarTypeOuterClass.AvatarType getAvatarType() {
@@ -169,7 +169,7 @@ public final class LineupSlotDataOuterClass {
     }
 
     /**
-     * optional .AvatarType avatar_type = 8;
+     * optional .AvatarType avatar_type = 11;
      * @param value the avatarType to set
      * @return this
      */
@@ -250,15 +250,15 @@ public final class LineupSlotDataOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(id);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 112);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(slot);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 88);
         output.writeEnumNoTag(avatarType);
       }
     }
@@ -285,25 +285,25 @@ public final class LineupSlotDataOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
+          case 80: {
             // id
             id = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 112) {
+            if (tag != 104) {
               break;
             }
           }
-          case 112: {
+          case 104: {
             // slot
             slot = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 88) {
               break;
             }
           }
-          case 64: {
+          case 88: {
             // avatarType
             final int value = input.readInt32();
             if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java
index 8edd68d..5598728 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 = 15;
      */
     private boolean isProtected;
 
     /**
-     * repeated uint32 equipment_id_list = 11;
+     * repeated uint32 equipment_id_list = 10;
      */
     private final RepeatedInt equipmentIdList = RepeatedInt.newEmptyInstance();
 
@@ -40,7 +40,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional bool is_protected = 9;
+     * optional bool is_protected = 15;
      * @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 = 15;
      * @return this
      */
     public LockEquipmentCsReq clearIsProtected() {
@@ -58,7 +58,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional bool is_protected = 9;
+     * optional bool is_protected = 15;
      * @return the isProtected
      */
     public boolean getIsProtected() {
@@ -66,7 +66,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional bool is_protected = 9;
+     * optional bool is_protected = 15;
      * @param value the isProtected to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 equipment_id_list = 11;
+     * repeated uint32 equipment_id_list = 10;
      * @return whether the equipmentIdList field is set
      */
     public boolean hasEquipmentIdList() {
@@ -85,7 +85,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 equipment_id_list = 11;
+     * repeated uint32 equipment_id_list = 10;
      * @return this
      */
     public LockEquipmentCsReq clearEquipmentIdList() {
@@ -95,7 +95,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 equipment_id_list = 11;
+     * repeated uint32 equipment_id_list = 10;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 equipment_id_list = 11;
+     * repeated uint32 equipment_id_list = 10;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 equipment_id_list = 11;
+     * repeated uint32 equipment_id_list = 10;
      * @param value the equipmentIdList to add
      * @return this
      */
@@ -134,7 +134,7 @@ public final class LockEquipmentCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 equipment_id_list = 11;
+     * repeated uint32 equipment_id_list = 10;
      * @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) 120);
         output.writeBoolNoTag(isProtected);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < equipmentIdList.length(); i++) {
-          output.writeRawByte((byte) 88);
+          output.writeRawByte((byte) 80);
           output.writeUInt32NoTag(equipmentIdList.array()[i]);
         }
       }
@@ -240,16 +240,16 @@ public final class LockEquipmentCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 72: {
+          case 120: {
             // isProtected
             isProtected = input.readBool();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 82) {
               break;
             }
           }
-          case 90: {
+          case 82: {
             // equipmentIdList [packed=true]
             input.readPackedUInt32(equipmentIdList, tag);
             bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public final class LockEquipmentCsReqOuterClass {
             tag = input.readTag();
             break;
           }
-          case 88: {
+          case 80: {
             // 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 199082c..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 = 8;
+     * optional uint32 retcode = 9;
      */
     private int retcode;
 
@@ -34,7 +34,7 @@ public final class LockEquipmentScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 8;
+     * 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 = 8;
+     * optional uint32 retcode = 9;
      * @return this
      */
     public LockEquipmentScRsp clearRetcode() {
@@ -52,7 +52,7 @@ public final class LockEquipmentScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 8;
+     * optional uint32 retcode = 9;
      * @return the retcode
      */
     public int getRetcode() {
@@ -60,7 +60,7 @@ public final class LockEquipmentScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 8;
+     * 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) 64);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(retcode);
       }
     }
@@ -150,7 +150,7 @@ public final class LockEquipmentScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 64: {
+          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 33fb5ec..6192a20 100644
--- a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java
@@ -20,12 +20,12 @@ public final class LockRelicCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional bool is_protected = 4;
+     * optional bool is_protected = 5;
      */
     private boolean isProtected;
 
     /**
-     * repeated uint32 relic_id_list = 12;
+     * repeated uint32 relic_id_list = 4;
      */
     private final RepeatedInt relicIdList = RepeatedInt.newEmptyInstance();
 
@@ -40,7 +40,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * optional bool is_protected = 4;
+     * optional bool is_protected = 5;
      * @return whether the isProtected field is set
      */
     public boolean hasIsProtected() {
@@ -48,7 +48,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * optional bool is_protected = 4;
+     * optional bool is_protected = 5;
      * @return this
      */
     public LockRelicCsReq clearIsProtected() {
@@ -58,7 +58,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * optional bool is_protected = 4;
+     * optional bool is_protected = 5;
      * @return the isProtected
      */
     public boolean getIsProtected() {
@@ -66,7 +66,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * optional bool is_protected = 4;
+     * optional bool is_protected = 5;
      * @param value the isProtected to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 relic_id_list = 12;
+     * repeated uint32 relic_id_list = 4;
      * @return whether the relicIdList field is set
      */
     public boolean hasRelicIdList() {
@@ -85,7 +85,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 relic_id_list = 12;
+     * repeated uint32 relic_id_list = 4;
      * @return this
      */
     public LockRelicCsReq clearRelicIdList() {
@@ -95,7 +95,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 relic_id_list = 12;
+     * repeated uint32 relic_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.
@@ -109,7 +109,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 relic_id_list = 12;
+     * repeated uint32 relic_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
@@ -123,7 +123,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 relic_id_list = 12;
+     * repeated uint32 relic_id_list = 4;
      * @param value the relicIdList to add
      * @return this
      */
@@ -134,7 +134,7 @@ public final class LockRelicCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 relic_id_list = 12;
+     * repeated uint32 relic_id_list = 4;
      * @param values the relicIdList to add
      * @return this
      */
@@ -210,12 +210,12 @@ public final class LockRelicCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 40);
         output.writeBoolNoTag(isProtected);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < relicIdList.length(); i++) {
-          output.writeRawByte((byte) 96);
+          output.writeRawByte((byte) 32);
           output.writeUInt32NoTag(relicIdList.array()[i]);
         }
       }
@@ -240,16 +240,16 @@ public final class LockRelicCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
+          case 40: {
             // isProtected
             isProtected = input.readBool();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 98) {
+            if (tag != 34) {
               break;
             }
           }
-          case 98: {
+          case 34: {
             // relicIdList [packed=true]
             input.readPackedUInt32(relicIdList, tag);
             bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public final class LockRelicCsReqOuterClass {
             tag = input.readTag();
             break;
           }
-          case 96: {
+          case 32: {
             // relicIdList [packed=false]
             tag = input.readRepeatedUInt32(relicIdList, tag);
             bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java
index c87f7ef..095cb28 100644
--- a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java
@@ -19,10 +19,15 @@ public final class LockRelicScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 13;
      */
     private int retcode;
 
+    /**
+     * optional uint32 relic_unique_id = 15;
+     */
+    private int relicUniqueId;
+
     private LockRelicScRsp() {
     }
 
@@ -34,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() {
@@ -42,7 +47,7 @@ public final class LockRelicScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 13;
      * @return this
      */
     public LockRelicScRsp clearRetcode() {
@@ -52,7 +57,7 @@ public final class LockRelicScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 13;
      * @return the retcode
      */
     public int getRetcode() {
@@ -60,7 +65,7 @@ public final class LockRelicScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 13;
      * @param value the retcode to set
      * @return this
      */
@@ -70,12 +75,50 @@ public final class LockRelicScRspOuterClass {
       return this;
     }
 
+    /**
+     * optional uint32 relic_unique_id = 15;
+     * @return whether the relicUniqueId field is set
+     */
+    public boolean hasRelicUniqueId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 relic_unique_id = 15;
+     * @return this
+     */
+    public LockRelicScRsp clearRelicUniqueId() {
+      bitField0_ &= ~0x00000002;
+      relicUniqueId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 relic_unique_id = 15;
+     * @return the relicUniqueId
+     */
+    public int getRelicUniqueId() {
+      return relicUniqueId;
+    }
+
+    /**
+     * optional uint32 relic_unique_id = 15;
+     * @param value the relicUniqueId to set
+     * @return this
+     */
+    public LockRelicScRsp setRelicUniqueId(final int value) {
+      bitField0_ |= 0x00000002;
+      relicUniqueId = value;
+      return this;
+    }
+
     @Override
     public LockRelicScRsp copyFrom(final LockRelicScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         retcode = other.retcode;
+        relicUniqueId = other.relicUniqueId;
       }
       return this;
     }
@@ -89,6 +132,9 @@ public final class LockRelicScRspOuterClass {
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
+      if (other.hasRelicUniqueId()) {
+        setRelicUniqueId(other.relicUniqueId);
+      }
       return this;
     }
 
@@ -100,6 +146,7 @@ public final class LockRelicScRspOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       retcode = 0;
+      relicUniqueId = 0;
       return this;
     }
 
@@ -123,15 +170,20 @@ public final class LockRelicScRspOuterClass {
       }
       LockRelicScRsp other = (LockRelicScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasRetcode() || retcode == other.retcode);
+        && (!hasRetcode() || retcode == other.retcode)
+        && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId);
     }
 
     @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) {
+        output.writeRawByte((byte) 120);
+        output.writeUInt32NoTag(relicUniqueId);
+      }
     }
 
     @Override
@@ -140,6 +192,9 @@ public final class LockRelicScRspOuterClass {
       if ((bitField0_ & 0x00000001) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId);
+      }
       return size;
     }
 
@@ -150,11 +205,20 @@ public final class LockRelicScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 56: {
+          case 104: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
+            if (tag != 120) {
+              break;
+            }
+          }
+          case 120: {
+            // relicUniqueId
+            relicUniqueId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
             if (tag != 0) {
               break;
             }
@@ -179,6 +243,9 @@ public final class LockRelicScRspOuterClass {
       if ((bitField0_ & 0x00000001) != 0) {
         output.writeUInt32(FieldNames.retcode, retcode);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId);
+      }
       output.endObject();
     }
 
@@ -200,6 +267,18 @@ public final class LockRelicScRspOuterClass {
             }
             break;
           }
+          case -1966200481:
+          case 49648253: {
+            if (input.isAtField(FieldNames.relicUniqueId)) {
+              if (!input.trySkipNullValue()) {
+                relicUniqueId = input.readUInt32();
+                bitField0_ |= 0x00000002;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           default: {
             input.skipUnknownField();
             break;
@@ -254,6 +333,8 @@ public final class LockRelicScRspOuterClass {
      */
     static class FieldNames {
       static final FieldName retcode = FieldName.forField("retcode");
+
+      static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/MailTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/MailTypeOuterClass.java
index 5fa7b76..455b2d6 100644
--- a/src/generated/main/emu/lunarcore/proto/MailTypeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MailTypeOuterClass.java
@@ -57,7 +57,7 @@ public final class MailTypeOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return MailTypeConverter.INSTANCE;
     }
 
@@ -79,7 +79,7 @@ public final class MailTypeOuterClass {
       return value == null ? other : value;
     }
 
-    enum MailTypeConverter implements EnumConverter {
+    enum MailTypeConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       private static final MailType[] lookup = new MailType[2];
diff --git a/src/generated/main/emu/lunarcore/proto/MapInfoChestTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/MapInfoChestTypeOuterClass.java
index 83b1d6e..a842f7c 100644
--- a/src/generated/main/emu/lunarcore/proto/MapInfoChestTypeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MapInfoChestTypeOuterClass.java
@@ -77,7 +77,7 @@ public final class MapInfoChestTypeOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return MapInfoChestTypeConverter.INSTANCE;
     }
 
@@ -99,7 +99,7 @@ public final class MapInfoChestTypeOuterClass {
       return value == null ? other : value;
     }
 
-    enum MapInfoChestTypeConverter implements EnumConverter {
+    enum MapInfoChestTypeConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       @Override
diff --git a/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java
index c0d2041..f14aaa7 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 = 6;
+     * optional uint32 avatar_id = 2;
      */
     private int avatarId;
 
     /**
-     * optional bool is_marked = 8;
+     * optional bool is_marked = 3;
      */
     private boolean isMarked;
 
@@ -39,7 +39,7 @@ public final class MarkAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 2;
      * @return whether the avatarId field is set
      */
     public boolean hasAvatarId() {
@@ -47,7 +47,7 @@ public final class MarkAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 2;
      * @return this
      */
     public MarkAvatarCsReq clearAvatarId() {
@@ -57,7 +57,7 @@ public final class MarkAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 2;
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -65,7 +65,7 @@ public final class MarkAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 2;
      * @param value the avatarId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class MarkAvatarCsReqOuterClass {
     }
 
     /**
-     * optional bool is_marked = 8;
+     * optional bool is_marked = 3;
      * @return whether the isMarked field is set
      */
     public boolean hasIsMarked() {
@@ -84,7 +84,7 @@ public final class MarkAvatarCsReqOuterClass {
     }
 
     /**
-     * optional bool is_marked = 8;
+     * optional bool is_marked = 3;
      * @return this
      */
     public MarkAvatarCsReq clearIsMarked() {
@@ -94,7 +94,7 @@ public final class MarkAvatarCsReqOuterClass {
     }
 
     /**
-     * optional bool is_marked = 8;
+     * optional bool is_marked = 3;
      * @return the isMarked
      */
     public boolean getIsMarked() {
@@ -102,7 +102,7 @@ public final class MarkAvatarCsReqOuterClass {
     }
 
     /**
-     * optional bool is_marked = 8;
+     * optional bool is_marked = 3;
      * @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) 48);
+        output.writeRawByte((byte) 16);
         output.writeUInt32NoTag(avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 24);
         output.writeBoolNoTag(isMarked);
       }
     }
@@ -205,16 +205,16 @@ public final class MarkAvatarCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
+          case 16: {
             // avatarId
             avatarId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 24) {
               break;
             }
           }
-          case 64: {
+          case 24: {
             // 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 4c1d058..1d9e047 100644
--- a/src/generated/main/emu/lunarcore/proto/MarkAvatarScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MarkAvatarScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class MarkAvatarScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 5;
      */
     private int avatarId;
 
     /**
-     * optional uint32 retcode = 10;
+     * optional uint32 retcode = 15;
      */
     private int retcode;
 
     /**
-     * optional bool is_marked = 3;
+     * optional bool is_marked = 10;
      */
     private boolean isMarked;
 
@@ -44,7 +44,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 5;
      * @return whether the avatarId field is set
      */
     public boolean hasAvatarId() {
@@ -52,7 +52,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 5;
      * @return this
      */
     public MarkAvatarScRsp clearAvatarId() {
@@ -62,7 +62,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 5;
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -70,7 +70,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 6;
+     * optional uint32 avatar_id = 5;
      * @param value the avatarId to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 10;
+     * optional uint32 retcode = 15;
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -89,7 +89,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 10;
+     * optional uint32 retcode = 15;
      * @return this
      */
     public MarkAvatarScRsp clearRetcode() {
@@ -99,7 +99,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 10;
+     * optional uint32 retcode = 15;
      * @return the retcode
      */
     public int getRetcode() {
@@ -107,7 +107,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 10;
+     * optional uint32 retcode = 15;
      * @param value the retcode to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional bool is_marked = 3;
+     * optional bool is_marked = 10;
      * @return whether the isMarked field is set
      */
     public boolean hasIsMarked() {
@@ -126,7 +126,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional bool is_marked = 3;
+     * optional bool is_marked = 10;
      * @return this
      */
     public MarkAvatarScRsp clearIsMarked() {
@@ -136,7 +136,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional bool is_marked = 3;
+     * optional bool is_marked = 10;
      * @return the isMarked
      */
     public boolean getIsMarked() {
@@ -144,7 +144,7 @@ public final class MarkAvatarScRspOuterClass {
     }
 
     /**
-     * optional bool is_marked = 3;
+     * optional bool is_marked = 10;
      * @param value the isMarked to set
      * @return this
      */
@@ -225,15 +225,15 @@ public final class MarkAvatarScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 48);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 120);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 24);
+        output.writeRawByte((byte) 80);
         output.writeBoolNoTag(isMarked);
       }
     }
@@ -260,25 +260,25 @@ public final class MarkAvatarScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
+          case 40: {
             // avatarId
             avatarId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
+            if (tag != 120) {
+              break;
+            }
+          }
+          case 120: {
+            // retcode
+            retcode = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
             if (tag != 80) {
               break;
             }
           }
           case 80: {
-            // retcode
-            retcode = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 24) {
-              break;
-            }
-          }
-          case 24: {
             // 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 55b249b..bbfd2ff 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 = 9;
+     * optional uint32 id = 3;
      */
     private int id;
 
@@ -34,7 +34,7 @@ public final class MarkReadMailCsReqOuterClass {
     }
 
     /**
-     * optional uint32 id = 9;
+     * optional uint32 id = 3;
      * @return whether the id field is set
      */
     public boolean hasId() {
@@ -42,7 +42,7 @@ public final class MarkReadMailCsReqOuterClass {
     }
 
     /**
-     * optional uint32 id = 9;
+     * optional uint32 id = 3;
      * @return this
      */
     public MarkReadMailCsReq clearId() {
@@ -52,7 +52,7 @@ public final class MarkReadMailCsReqOuterClass {
     }
 
     /**
-     * optional uint32 id = 9;
+     * optional uint32 id = 3;
      * @return the id
      */
     public int getId() {
@@ -60,7 +60,7 @@ public final class MarkReadMailCsReqOuterClass {
     }
 
     /**
-     * optional uint32 id = 9;
+     * optional uint32 id = 3;
      * @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) 72);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(id);
       }
     }
@@ -150,7 +150,7 @@ public final class MarkReadMailCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 72: {
+          case 24: {
             // 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 d21d0cc..fde32df 100644
--- a/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java
@@ -19,15 +19,15 @@ public final class MarkReadMailScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 id = 6;
-     */
-    private int id;
-
-    /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 10;
      */
     private int retcode;
 
+    /**
+     * optional uint32 id = 13;
+     */
+    private int id;
+
     private MarkReadMailScRsp() {
     }
 
@@ -39,62 +39,25 @@ public final class MarkReadMailScRspOuterClass {
     }
 
     /**
-     * optional uint32 id = 6;
-     * @return whether the id field is set
+     * optional uint32 retcode = 10;
+     * @return whether the retcode field is set
      */
-    public boolean hasId() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 id = 6;
-     * @return this
-     */
-    public MarkReadMailScRsp clearId() {
-      bitField0_ &= ~0x00000001;
-      id = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 id = 6;
-     * @return the id
-     */
-    public int getId() {
-      return id;
-    }
-
-    /**
-     * optional uint32 id = 6;
-     * @param value the id to set
-     * @return this
-     */
-    public MarkReadMailScRsp setId(final int value) {
-      bitField0_ |= 0x00000001;
-      id = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 retcode = 7;
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 10;
      * @return this
      */
     public MarkReadMailScRsp clearRetcode() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       retcode = 0;
       return this;
     }
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 10;
      * @return the retcode
      */
     public int getRetcode() {
@@ -102,23 +65,60 @@ public final class MarkReadMailScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 10;
      * @param value the retcode to set
      * @return this
      */
     public MarkReadMailScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       retcode = value;
       return this;
     }
 
+    /**
+     * optional uint32 id = 13;
+     * @return whether the id field is set
+     */
+    public boolean hasId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 id = 13;
+     * @return this
+     */
+    public MarkReadMailScRsp clearId() {
+      bitField0_ &= ~0x00000002;
+      id = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 id = 13;
+     * @return the id
+     */
+    public int getId() {
+      return id;
+    }
+
+    /**
+     * optional uint32 id = 13;
+     * @param value the id to set
+     * @return this
+     */
+    public MarkReadMailScRsp setId(final int value) {
+      bitField0_ |= 0x00000002;
+      id = value;
+      return this;
+    }
+
     @Override
     public MarkReadMailScRsp copyFrom(final MarkReadMailScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        id = other.id;
         retcode = other.retcode;
+        id = other.id;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class MarkReadMailScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasId()) {
-        setId(other.id);
-      }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
+      if (other.hasId()) {
+        setId(other.id);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class MarkReadMailScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      id = 0;
       retcode = 0;
+      id = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class MarkReadMailScRspOuterClass {
       }
       MarkReadMailScRsp other = (MarkReadMailScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasId() || id == other.id)
-        && (!hasRetcode() || retcode == other.retcode);
+        && (!hasRetcode() || retcode == other.retcode)
+        && (!hasId() || id == other.id);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 48);
-        output.writeUInt32NoTag(id);
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(id);
       }
     }
 
@@ -190,10 +190,10 @@ public final class MarkReadMailScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class MarkReadMailScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
-            // id
-            id = input.readUInt32();
+          case 80: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 104) {
               break;
             }
           }
-          case 56: {
-            // retcode
-            retcode = input.readUInt32();
+          case 104: {
+            // id
+            id = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class MarkReadMailScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.id, id);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.id, id);
       }
       output.endObject();
     }
@@ -256,10 +256,10 @@ public final class MarkReadMailScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 3355: {
-            if (input.isAtField(FieldNames.id)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                id = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -267,10 +267,10 @@ public final class MarkReadMailScRspOuterClass {
             }
             break;
           }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case 3355: {
+            if (input.isAtField(FieldNames.id)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                id = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -331,9 +331,9 @@ public final class MarkReadMailScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName id = FieldName.forField("id");
-
       static final FieldName retcode = FieldName.forField("retcode");
+
+      static final FieldName id = FieldName.forField("id");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java
index 8c8c14c..ee5c9d1 100644
--- a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java
@@ -19,15 +19,15 @@ public final class MaterialOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 num = 5;
-     */
-    private int num;
-
-    /**
-     * optional uint32 tid = 7;
+     * optional uint32 tid = 6;
      */
     private int tid;
 
+    /**
+     * optional uint32 num = 10;
+     */
+    private int num;
+
     private Material() {
     }
 
@@ -39,62 +39,25 @@ public final class MaterialOuterClass {
     }
 
     /**
-     * optional uint32 num = 5;
-     * @return whether the num field is set
+     * optional uint32 tid = 6;
+     * @return whether the tid field is set
      */
-    public boolean hasNum() {
+    public boolean hasTid() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 num = 5;
-     * @return this
-     */
-    public Material clearNum() {
-      bitField0_ &= ~0x00000001;
-      num = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 num = 5;
-     * @return the num
-     */
-    public int getNum() {
-      return num;
-    }
-
-    /**
-     * optional uint32 num = 5;
-     * @param value the num to set
-     * @return this
-     */
-    public Material setNum(final int value) {
-      bitField0_ |= 0x00000001;
-      num = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 tid = 7;
-     * @return whether the tid field is set
-     */
-    public boolean hasTid() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 tid = 7;
+     * optional uint32 tid = 6;
      * @return this
      */
     public Material clearTid() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       tid = 0;
       return this;
     }
 
     /**
-     * optional uint32 tid = 7;
+     * optional uint32 tid = 6;
      * @return the tid
      */
     public int getTid() {
@@ -102,23 +65,60 @@ public final class MaterialOuterClass {
     }
 
     /**
-     * optional uint32 tid = 7;
+     * optional uint32 tid = 6;
      * @param value the tid to set
      * @return this
      */
     public Material setTid(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       tid = value;
       return this;
     }
 
+    /**
+     * optional uint32 num = 10;
+     * @return whether the num field is set
+     */
+    public boolean hasNum() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 num = 10;
+     * @return this
+     */
+    public Material clearNum() {
+      bitField0_ &= ~0x00000002;
+      num = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 num = 10;
+     * @return the num
+     */
+    public int getNum() {
+      return num;
+    }
+
+    /**
+     * optional uint32 num = 10;
+     * @param value the num to set
+     * @return this
+     */
+    public Material setNum(final int value) {
+      bitField0_ |= 0x00000002;
+      num = value;
+      return this;
+    }
+
     @Override
     public Material copyFrom(final Material other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        num = other.num;
         tid = other.tid;
+        num = other.num;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class MaterialOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasNum()) {
-        setNum(other.num);
-      }
       if (other.hasTid()) {
         setTid(other.tid);
       }
+      if (other.hasNum()) {
+        setNum(other.num);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class MaterialOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      num = 0;
       tid = 0;
+      num = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class MaterialOuterClass {
       }
       Material other = (Material) o;
       return bitField0_ == other.bitField0_
-        && (!hasNum() || num == other.num)
-        && (!hasTid() || tid == other.tid);
+        && (!hasTid() || tid == other.tid)
+        && (!hasNum() || num == other.num);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeUInt32NoTag(num);
+        output.writeRawByte((byte) 48);
+        output.writeUInt32NoTag(tid);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(tid);
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(num);
       }
     }
 
@@ -190,10 +190,10 @@ public final class MaterialOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(tid);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(tid);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class MaterialOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
-            // num
-            num = input.readUInt32();
+          case 48: {
+            // tid
+            tid = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 80) {
               break;
             }
           }
-          case 56: {
-            // tid
-            tid = input.readUInt32();
+          case 80: {
+            // num
+            num = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class MaterialOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.num, num);
+        output.writeUInt32(FieldNames.tid, tid);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.tid, tid);
+        output.writeUInt32(FieldNames.num, num);
       }
       output.endObject();
     }
@@ -256,10 +256,10 @@ public final class MaterialOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 109446: {
-            if (input.isAtField(FieldNames.num)) {
+          case 114831: {
+            if (input.isAtField(FieldNames.tid)) {
               if (!input.trySkipNullValue()) {
-                num = input.readUInt32();
+                tid = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -267,10 +267,10 @@ public final class MaterialOuterClass {
             }
             break;
           }
-          case 114831: {
-            if (input.isAtField(FieldNames.tid)) {
+          case 109446: {
+            if (input.isAtField(FieldNames.num)) {
               if (!input.trySkipNullValue()) {
-                tid = input.readUInt32();
+                num = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -330,9 +330,9 @@ public final class MaterialOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName num = FieldName.forField("num");
-
       static final FieldName tid = FieldName.forField("tid");
+
+      static final FieldName num = FieldName.forField("num");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java
index 6126b7d..1f5e5d0 100644
--- a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java
@@ -19,12 +19,12 @@ public final class MazeChestOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 total_amount_list = 3;
+     * optional uint32 total_amount_list = 9;
      */
     private int totalAmountList;
 
     /**
-     * optional uint32 unlocked_amount_list = 7;
+     * optional uint32 unlocked_amount_list = 12;
      */
     private int unlockedAmountList;
 
@@ -44,7 +44,7 @@ public final class MazeChestOuterClass {
     }
 
     /**
-     * optional uint32 total_amount_list = 3;
+     * optional uint32 total_amount_list = 9;
      * @return whether the totalAmountList field is set
      */
     public boolean hasTotalAmountList() {
@@ -52,7 +52,7 @@ public final class MazeChestOuterClass {
     }
 
     /**
-     * optional uint32 total_amount_list = 3;
+     * optional uint32 total_amount_list = 9;
      * @return this
      */
     public MazeChest clearTotalAmountList() {
@@ -62,7 +62,7 @@ public final class MazeChestOuterClass {
     }
 
     /**
-     * optional uint32 total_amount_list = 3;
+     * optional uint32 total_amount_list = 9;
      * @return the totalAmountList
      */
     public int getTotalAmountList() {
@@ -70,7 +70,7 @@ public final class MazeChestOuterClass {
     }
 
     /**
-     * optional uint32 total_amount_list = 3;
+     * optional uint32 total_amount_list = 9;
      * @param value the totalAmountList to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class MazeChestOuterClass {
     }
 
     /**
-     * optional uint32 unlocked_amount_list = 7;
+     * 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 = 7;
+     * optional uint32 unlocked_amount_list = 12;
      * @return this
      */
     public MazeChest clearUnlockedAmountList() {
@@ -99,7 +99,7 @@ public final class MazeChestOuterClass {
     }
 
     /**
-     * optional uint32 unlocked_amount_list = 7;
+     * 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 = 7;
+     * optional uint32 unlocked_amount_list = 12;
      * @param value the unlockedAmountList to set
      * @return this
      */
@@ -250,11 +250,11 @@ public final class MazeChestOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 24);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(totalAmountList);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(unlockedAmountList);
       }
       if ((bitField0_ & 0x00000004) != 0) {
@@ -285,16 +285,16 @@ public final class MazeChestOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
+          case 72: {
             // totalAmountList
             totalAmountList = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 96) {
               break;
             }
           }
-          case 56: {
+          case 96: {
             // unlockedAmountList
             unlockedAmountList = input.readUInt32();
             bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java
index d7dcd2b..30adee5 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 = 3;
+     * optional int64 modify_time = 9;
      */
     private long modifyTime;
 
     /**
-     * optional uint32 group_id = 1;
+     * optional uint32 group_id = 13;
      */
     private int groupId;
 
@@ -39,7 +39,7 @@ public final class MazeGroupOuterClass {
     }
 
     /**
-     * optional int64 modify_time = 3;
+     * optional int64 modify_time = 9;
      * @return whether the modifyTime field is set
      */
     public boolean hasModifyTime() {
@@ -47,7 +47,7 @@ public final class MazeGroupOuterClass {
     }
 
     /**
-     * optional int64 modify_time = 3;
+     * optional int64 modify_time = 9;
      * @return this
      */
     public MazeGroup clearModifyTime() {
@@ -57,7 +57,7 @@ public final class MazeGroupOuterClass {
     }
 
     /**
-     * optional int64 modify_time = 3;
+     * optional int64 modify_time = 9;
      * @return the modifyTime
      */
     public long getModifyTime() {
@@ -65,7 +65,7 @@ public final class MazeGroupOuterClass {
     }
 
     /**
-     * optional int64 modify_time = 3;
+     * optional int64 modify_time = 9;
      * @param value the modifyTime to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class MazeGroupOuterClass {
     }
 
     /**
-     * optional uint32 group_id = 1;
+     * optional uint32 group_id = 13;
      * @return whether the groupId field is set
      */
     public boolean hasGroupId() {
@@ -84,7 +84,7 @@ public final class MazeGroupOuterClass {
     }
 
     /**
-     * optional uint32 group_id = 1;
+     * optional uint32 group_id = 13;
      * @return this
      */
     public MazeGroup clearGroupId() {
@@ -94,7 +94,7 @@ public final class MazeGroupOuterClass {
     }
 
     /**
-     * optional uint32 group_id = 1;
+     * optional uint32 group_id = 13;
      * @return the groupId
      */
     public int getGroupId() {
@@ -102,7 +102,7 @@ public final class MazeGroupOuterClass {
     }
 
     /**
-     * optional uint32 group_id = 1;
+     * optional uint32 group_id = 13;
      * @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) 24);
+        output.writeRawByte((byte) 72);
         output.writeInt64NoTag(modifyTime);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(groupId);
       }
     }
@@ -205,16 +205,16 @@ public final class MazeGroupOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
+          case 72: {
             // modifyTime
             modifyTime = input.readInt64();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 8) {
+            if (tag != 104) {
               break;
             }
           }
-          case 8: {
+          case 104: {
             // 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 5505ebb..f18c423 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 content_id = 1;
-     */
-    private int contentId;
-
-    /**
-     * optional uint32 entry_id = 4;
-     */
-    private int entryId;
-
-    /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 6;
      */
     private int retcode;
 
     /**
-     * repeated uint32 lighten_section_list = 5;
+     * optional uint32 entry_id = 9;
+     */
+    private int entryId;
+
+    /**
+     * optional uint32 content_id = 13;
+     */
+    private int contentId;
+
+    /**
+     * repeated uint32 lighten_section_list = 10;
      */
     private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance();
 
     /**
-     * repeated uint32 unlocked_teleport_list = 14;
+     * repeated uint32 unlocked_teleport_list = 11;
      */
     private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance();
 
     /**
-     * repeated .MazeChest unlocked_chest_list = 3;
+     * repeated .MazeGroup maze_group_list = 1;
      */
-    private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory());
+    private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory());
 
     /**
-     * repeated .MazeProp maze_prop_list = 6;
+     * repeated .MazeProp maze_prop_list = 5;
      */
     private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory());
 
     /**
-     * repeated .MazeGroup maze_group_list = 11;
+     * repeated .MazeChest unlocked_chest_list = 7;
      */
-    private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory());
+    private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory());
 
     private MazeMapData() {
     }
@@ -71,44 +71,44 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * optional uint32 content_id = 1;
-     * @return whether the contentId field is set
+     * optional uint32 retcode = 6;
+     * @return whether the retcode field is set
      */
-    public boolean hasContentId() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 content_id = 1;
+     * optional uint32 retcode = 6;
      * @return this
      */
-    public MazeMapData clearContentId() {
+    public MazeMapData clearRetcode() {
       bitField0_ &= ~0x00000001;
-      contentId = 0;
+      retcode = 0;
       return this;
     }
 
     /**
-     * optional uint32 content_id = 1;
-     * @return the contentId
+     * optional uint32 retcode = 6;
+     * @return the retcode
      */
-    public int getContentId() {
-      return contentId;
+    public int getRetcode() {
+      return retcode;
     }
 
     /**
-     * optional uint32 content_id = 1;
-     * @param value the contentId to set
+     * optional uint32 retcode = 6;
+     * @param value the retcode to set
      * @return this
      */
-    public MazeMapData setContentId(final int value) {
+    public MazeMapData setRetcode(final int value) {
       bitField0_ |= 0x00000001;
-      contentId = value;
+      retcode = value;
       return this;
     }
 
     /**
-     * optional uint32 entry_id = 4;
+     * optional uint32 entry_id = 9;
      * @return whether the entryId field is set
      */
     public boolean hasEntryId() {
@@ -116,7 +116,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * optional uint32 entry_id = 4;
+     * optional uint32 entry_id = 9;
      * @return this
      */
     public MazeMapData clearEntryId() {
@@ -126,7 +126,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * optional uint32 entry_id = 4;
+     * optional uint32 entry_id = 9;
      * @return the entryId
      */
     public int getEntryId() {
@@ -134,7 +134,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * optional uint32 entry_id = 4;
+     * optional uint32 entry_id = 9;
      * @param value the entryId to set
      * @return this
      */
@@ -145,44 +145,44 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 7;
-     * @return whether the retcode field is set
+     * optional uint32 content_id = 13;
+     * @return whether the contentId field is set
      */
-    public boolean hasRetcode() {
+    public boolean hasContentId() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 content_id = 13;
      * @return this
      */
-    public MazeMapData clearRetcode() {
+    public MazeMapData clearContentId() {
       bitField0_ &= ~0x00000004;
-      retcode = 0;
+      contentId = 0;
       return this;
     }
 
     /**
-     * optional uint32 retcode = 7;
-     * @return the retcode
+     * optional uint32 content_id = 13;
+     * @return the contentId
      */
-    public int getRetcode() {
-      return retcode;
+    public int getContentId() {
+      return contentId;
     }
 
     /**
-     * optional uint32 retcode = 7;
-     * @param value the retcode to set
+     * optional uint32 content_id = 13;
+     * @param value the contentId to set
      * @return this
      */
-    public MazeMapData setRetcode(final int value) {
+    public MazeMapData setContentId(final int value) {
       bitField0_ |= 0x00000004;
-      retcode = value;
+      contentId = value;
       return this;
     }
 
     /**
-     * repeated uint32 lighten_section_list = 5;
+     * repeated uint32 lighten_section_list = 10;
      * @return whether the lightenSectionList field is set
      */
     public boolean hasLightenSectionList() {
@@ -190,7 +190,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 lighten_section_list = 5;
+     * repeated uint32 lighten_section_list = 10;
      * @return this
      */
     public MazeMapData clearLightenSectionList() {
@@ -200,7 +200,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 lighten_section_list = 5;
+     * 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.
@@ -214,7 +214,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 lighten_section_list = 5;
+     * 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
@@ -228,7 +228,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 lighten_section_list = 5;
+     * repeated uint32 lighten_section_list = 10;
      * @param value the lightenSectionList to add
      * @return this
      */
@@ -239,7 +239,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 lighten_section_list = 5;
+     * repeated uint32 lighten_section_list = 10;
      * @param values the lightenSectionList to add
      * @return this
      */
@@ -250,7 +250,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 unlocked_teleport_list = 14;
+     * repeated uint32 unlocked_teleport_list = 11;
      * @return whether the unlockedTeleportList field is set
      */
     public boolean hasUnlockedTeleportList() {
@@ -258,7 +258,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 unlocked_teleport_list = 14;
+     * repeated uint32 unlocked_teleport_list = 11;
      * @return this
      */
     public MazeMapData clearUnlockedTeleportList() {
@@ -268,7 +268,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 unlocked_teleport_list = 14;
+     * repeated uint32 unlocked_teleport_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.
@@ -282,7 +282,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 unlocked_teleport_list = 14;
+     * repeated uint32 unlocked_teleport_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
@@ -296,7 +296,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 unlocked_teleport_list = 14;
+     * repeated uint32 unlocked_teleport_list = 11;
      * @param value the unlockedTeleportList to add
      * @return this
      */
@@ -307,7 +307,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated uint32 unlocked_teleport_list = 14;
+     * repeated uint32 unlocked_teleport_list = 11;
      * @param values the unlockedTeleportList to add
      * @return this
      */
@@ -318,161 +318,25 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated .MazeChest unlocked_chest_list = 3;
-     * @return whether the unlockedChestList field is set
+     * repeated .MazeGroup maze_group_list = 1;
+     * @return whether the mazeGroupList field is set
      */
-    public boolean hasUnlockedChestList() {
+    public boolean hasMazeGroupList() {
       return (bitField0_ & 0x00000020) != 0;
     }
 
     /**
-     * repeated .MazeChest unlocked_chest_list = 3;
-     * @return this
-     */
-    public MazeMapData clearUnlockedChestList() {
-      bitField0_ &= ~0x00000020;
-      unlockedChestList.clear();
-      return this;
-    }
-
-    /**
-     * repeated .MazeChest unlocked_chest_list = 3;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * 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 = 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 getMutableUnlockedChestList() {
-      bitField0_ |= 0x00000020;
-      return unlockedChestList;
-    }
-
-    /**
-     * repeated .MazeChest unlocked_chest_list = 3;
-     * @param value the unlockedChestList to add
-     * @return this
-     */
-    public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) {
-      bitField0_ |= 0x00000020;
-      unlockedChestList.add(value);
-      return this;
-    }
-
-    /**
-     * repeated .MazeChest unlocked_chest_list = 3;
-     * @param values the unlockedChestList to add
-     * @return this
-     */
-    public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) {
-      bitField0_ |= 0x00000020;
-      unlockedChestList.addAll(values);
-      return this;
-    }
-
-    /**
-     * repeated .MazeProp maze_prop_list = 6;
-     * @return whether the mazePropList field is set
-     */
-    public boolean hasMazePropList() {
-      return (bitField0_ & 0x00000040) != 0;
-    }
-
-    /**
-     * repeated .MazeProp maze_prop_list = 6;
-     * @return this
-     */
-    public MazeMapData clearMazePropList() {
-      bitField0_ &= ~0x00000040;
-      mazePropList.clear();
-      return this;
-    }
-
-    /**
-     * repeated .MazeProp maze_prop_list = 6;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableMazePropList()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RepeatedMessage getMazePropList() {
-      return mazePropList;
-    }
-
-    /**
-     * repeated .MazeProp maze_prop_list = 6;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public RepeatedMessage getMutableMazePropList() {
-      bitField0_ |= 0x00000040;
-      return mazePropList;
-    }
-
-    /**
-     * repeated .MazeProp maze_prop_list = 6;
-     * @param value the mazePropList to add
-     * @return this
-     */
-    public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) {
-      bitField0_ |= 0x00000040;
-      mazePropList.add(value);
-      return this;
-    }
-
-    /**
-     * repeated .MazeProp maze_prop_list = 6;
-     * @param values the mazePropList to add
-     * @return this
-     */
-    public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) {
-      bitField0_ |= 0x00000040;
-      mazePropList.addAll(values);
-      return this;
-    }
-
-    /**
-     * repeated .MazeGroup maze_group_list = 11;
-     * @return whether the mazeGroupList field is set
-     */
-    public boolean hasMazeGroupList() {
-      return (bitField0_ & 0x00000080) != 0;
-    }
-
-    /**
-     * repeated .MazeGroup maze_group_list = 11;
+     * repeated .MazeGroup maze_group_list = 1;
      * @return this
      */
     public MazeMapData clearMazeGroupList() {
-      bitField0_ &= ~0x00000080;
+      bitField0_ &= ~0x00000020;
       mazeGroupList.clear();
       return this;
     }
 
     /**
-     * repeated .MazeGroup maze_group_list = 11;
+     * repeated .MazeGroup maze_group_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.
@@ -486,7 +350,7 @@ public final class MazeMapDataOuterClass {
     }
 
     /**
-     * repeated .MazeGroup maze_group_list = 11;
+     * repeated .MazeGroup maze_group_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
@@ -495,45 +359,181 @@ public final class MazeMapDataOuterClass {
      * @return internal storage object for modifications
      */
     public RepeatedMessage getMutableMazeGroupList() {
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000020;
       return mazeGroupList;
     }
 
     /**
-     * repeated .MazeGroup maze_group_list = 11;
+     * repeated .MazeGroup maze_group_list = 1;
      * @param value the mazeGroupList to add
      * @return this
      */
     public MazeMapData addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) {
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000020;
       mazeGroupList.add(value);
       return this;
     }
 
     /**
-     * repeated .MazeGroup maze_group_list = 11;
+     * repeated .MazeGroup maze_group_list = 1;
      * @param values the mazeGroupList to add
      * @return this
      */
     public MazeMapData addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) {
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000020;
       mazeGroupList.addAll(values);
       return this;
     }
 
+    /**
+     * repeated .MazeProp maze_prop_list = 5;
+     * @return whether the mazePropList field is set
+     */
+    public boolean hasMazePropList() {
+      return (bitField0_ & 0x00000040) != 0;
+    }
+
+    /**
+     * repeated .MazeProp maze_prop_list = 5;
+     * @return this
+     */
+    public MazeMapData clearMazePropList() {
+      bitField0_ &= ~0x00000040;
+      mazePropList.clear();
+      return this;
+    }
+
+    /**
+     * repeated .MazeProp maze_prop_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 #getMutableMazePropList()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public RepeatedMessage getMazePropList() {
+      return mazePropList;
+    }
+
+    /**
+     * repeated .MazeProp maze_prop_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 getMutableMazePropList() {
+      bitField0_ |= 0x00000040;
+      return mazePropList;
+    }
+
+    /**
+     * repeated .MazeProp maze_prop_list = 5;
+     * @param value the mazePropList to add
+     * @return this
+     */
+    public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) {
+      bitField0_ |= 0x00000040;
+      mazePropList.add(value);
+      return this;
+    }
+
+    /**
+     * repeated .MazeProp maze_prop_list = 5;
+     * @param values the mazePropList to add
+     * @return this
+     */
+    public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) {
+      bitField0_ |= 0x00000040;
+      mazePropList.addAll(values);
+      return this;
+    }
+
+    /**
+     * repeated .MazeChest unlocked_chest_list = 7;
+     * @return whether the unlockedChestList field is set
+     */
+    public boolean hasUnlockedChestList() {
+      return (bitField0_ & 0x00000080) != 0;
+    }
+
+    /**
+     * repeated .MazeChest unlocked_chest_list = 7;
+     * @return this
+     */
+    public MazeMapData clearUnlockedChestList() {
+      bitField0_ &= ~0x00000080;
+      unlockedChestList.clear();
+      return this;
+    }
+
+    /**
+     * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public RepeatedMessage getUnlockedChestList() {
+      return unlockedChestList;
+    }
+
+    /**
+     * repeated .MazeChest unlocked_chest_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 getMutableUnlockedChestList() {
+      bitField0_ |= 0x00000080;
+      return unlockedChestList;
+    }
+
+    /**
+     * repeated .MazeChest unlocked_chest_list = 7;
+     * @param value the unlockedChestList to add
+     * @return this
+     */
+    public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) {
+      bitField0_ |= 0x00000080;
+      unlockedChestList.add(value);
+      return this;
+    }
+
+    /**
+     * repeated .MazeChest unlocked_chest_list = 7;
+     * @param values the unlockedChestList to add
+     * @return this
+     */
+    public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) {
+      bitField0_ |= 0x00000080;
+      unlockedChestList.addAll(values);
+      return this;
+    }
+
     @Override
     public MazeMapData copyFrom(final MazeMapData other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        contentId = other.contentId;
-        entryId = other.entryId;
         retcode = other.retcode;
+        entryId = other.entryId;
+        contentId = other.contentId;
         lightenSectionList.copyFrom(other.lightenSectionList);
         unlockedTeleportList.copyFrom(other.unlockedTeleportList);
-        unlockedChestList.copyFrom(other.unlockedChestList);
-        mazePropList.copyFrom(other.mazePropList);
         mazeGroupList.copyFrom(other.mazeGroupList);
+        mazePropList.copyFrom(other.mazePropList);
+        unlockedChestList.copyFrom(other.unlockedChestList);
       }
       return this;
     }
@@ -544,14 +544,14 @@ public final class MazeMapDataOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasContentId()) {
-        setContentId(other.contentId);
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
       }
       if (other.hasEntryId()) {
         setEntryId(other.entryId);
       }
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
+      if (other.hasContentId()) {
+        setContentId(other.contentId);
       }
       if (other.hasLightenSectionList()) {
         getMutableLightenSectionList().addAll(other.lightenSectionList);
@@ -559,14 +559,14 @@ public final class MazeMapDataOuterClass {
       if (other.hasUnlockedTeleportList()) {
         getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList);
       }
-      if (other.hasUnlockedChestList()) {
-        getMutableUnlockedChestList().addAll(other.unlockedChestList);
+      if (other.hasMazeGroupList()) {
+        getMutableMazeGroupList().addAll(other.mazeGroupList);
       }
       if (other.hasMazePropList()) {
         getMutableMazePropList().addAll(other.mazePropList);
       }
-      if (other.hasMazeGroupList()) {
-        getMutableMazeGroupList().addAll(other.mazeGroupList);
+      if (other.hasUnlockedChestList()) {
+        getMutableUnlockedChestList().addAll(other.unlockedChestList);
       }
       return this;
     }
@@ -578,14 +578,14 @@ public final class MazeMapDataOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      contentId = 0;
-      entryId = 0;
       retcode = 0;
+      entryId = 0;
+      contentId = 0;
       lightenSectionList.clear();
       unlockedTeleportList.clear();
-      unlockedChestList.clear();
-      mazePropList.clear();
       mazeGroupList.clear();
+      mazePropList.clear();
+      unlockedChestList.clear();
       return this;
     }
 
@@ -598,9 +598,9 @@ public final class MazeMapDataOuterClass {
       bitField0_ = 0;
       lightenSectionList.clear();
       unlockedTeleportList.clear();
-      unlockedChestList.clearQuick();
-      mazePropList.clearQuick();
       mazeGroupList.clearQuick();
+      mazePropList.clearQuick();
+      unlockedChestList.clearQuick();
       return this;
     }
 
@@ -614,58 +614,58 @@ public final class MazeMapDataOuterClass {
       }
       MazeMapData other = (MazeMapData) o;
       return bitField0_ == other.bitField0_
-        && (!hasContentId() || contentId == other.contentId)
-        && (!hasEntryId() || entryId == other.entryId)
         && (!hasRetcode() || retcode == other.retcode)
+        && (!hasEntryId() || entryId == other.entryId)
+        && (!hasContentId() || contentId == other.contentId)
         && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList))
         && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList))
-        && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList))
+        && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList))
         && (!hasMazePropList() || mazePropList.equals(other.mazePropList))
-        && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList));
+        && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeUInt32NoTag(contentId);
+        output.writeRawByte((byte) 48);
+        output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(entryId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(contentId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         for (int i = 0; i < lightenSectionList.length(); i++) {
-          output.writeRawByte((byte) 40);
+          output.writeRawByte((byte) 80);
           output.writeUInt32NoTag(lightenSectionList.array()[i]);
         }
       }
       if ((bitField0_ & 0x00000010) != 0) {
         for (int i = 0; i < unlockedTeleportList.length(); i++) {
-          output.writeRawByte((byte) 112);
+          output.writeRawByte((byte) 88);
           output.writeUInt32NoTag(unlockedTeleportList.array()[i]);
         }
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        for (int i = 0; i < unlockedChestList.length(); i++) {
-          output.writeRawByte((byte) 26);
-          output.writeMessageNoTag(unlockedChestList.get(i));
+        for (int i = 0; i < mazeGroupList.length(); i++) {
+          output.writeRawByte((byte) 10);
+          output.writeMessageNoTag(mazeGroupList.get(i));
         }
       }
       if ((bitField0_ & 0x00000040) != 0) {
         for (int i = 0; i < mazePropList.length(); i++) {
-          output.writeRawByte((byte) 50);
+          output.writeRawByte((byte) 42);
           output.writeMessageNoTag(mazePropList.get(i));
         }
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        for (int i = 0; i < mazeGroupList.length(); i++) {
-          output.writeRawByte((byte) 90);
-          output.writeMessageNoTag(mazeGroupList.get(i));
+        for (int i = 0; i < unlockedChestList.length(); i++) {
+          output.writeRawByte((byte) 58);
+          output.writeMessageNoTag(unlockedChestList.get(i));
         }
       }
     }
@@ -674,13 +674,13 @@ public final class MazeMapDataOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(contentId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(contentId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList);
@@ -689,13 +689,13 @@ public final class MazeMapDataOuterClass {
         size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList);
+        size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList);
+        size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList);
       }
       return size;
     }
@@ -707,70 +707,70 @@ public final class MazeMapDataOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
-            // contentId
-            contentId = input.readUInt32();
+          case 48: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 72) {
               break;
             }
           }
-          case 32: {
+          case 72: {
             // entryId
             entryId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 104) {
               break;
             }
           }
-          case 56: {
-            // retcode
-            retcode = input.readUInt32();
+          case 104: {
+            // contentId
+            contentId = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 82) {
               break;
             }
           }
-          case 42: {
+          case 82: {
             // lightenSectionList [packed=true]
             input.readPackedUInt32(lightenSectionList, tag);
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 114) {
-              break;
-            }
-          }
-          case 114: {
-            // unlockedTeleportList [packed=true]
-            input.readPackedUInt32(unlockedTeleportList, tag);
-            bitField0_ |= 0x00000010;
-            tag = input.readTag();
-            if (tag != 26) {
-              break;
-            }
-          }
-          case 26: {
-            // unlockedChestList
-            tag = input.readRepeatedMessage(unlockedChestList, tag);
-            bitField0_ |= 0x00000020;
-            if (tag != 50) {
-              break;
-            }
-          }
-          case 50: {
-            // mazePropList
-            tag = input.readRepeatedMessage(mazePropList, tag);
-            bitField0_ |= 0x00000040;
             if (tag != 90) {
               break;
             }
           }
           case 90: {
+            // unlockedTeleportList [packed=true]
+            input.readPackedUInt32(unlockedTeleportList, tag);
+            bitField0_ |= 0x00000010;
+            tag = input.readTag();
+            if (tag != 10) {
+              break;
+            }
+          }
+          case 10: {
             // mazeGroupList
             tag = input.readRepeatedMessage(mazeGroupList, tag);
+            bitField0_ |= 0x00000020;
+            if (tag != 42) {
+              break;
+            }
+          }
+          case 42: {
+            // mazePropList
+            tag = input.readRepeatedMessage(mazePropList, tag);
+            bitField0_ |= 0x00000040;
+            if (tag != 58) {
+              break;
+            }
+          }
+          case 58: {
+            // unlockedChestList
+            tag = input.readRepeatedMessage(unlockedChestList, tag);
             bitField0_ |= 0x00000080;
             if (tag != 0) {
               break;
@@ -786,13 +786,13 @@ public final class MazeMapDataOuterClass {
             tag = input.readTag();
             break;
           }
-          case 40: {
+          case 80: {
             // lightenSectionList [packed=false]
             tag = input.readRepeatedUInt32(lightenSectionList, tag);
             bitField0_ |= 0x00000008;
             break;
           }
-          case 112: {
+          case 88: {
             // unlockedTeleportList [packed=false]
             tag = input.readRepeatedUInt32(unlockedTeleportList, tag);
             bitField0_ |= 0x00000010;
@@ -806,13 +806,13 @@ public final class MazeMapDataOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.contentId, contentId);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.entryId, entryId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.contentId, contentId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList);
@@ -821,13 +821,13 @@ public final class MazeMapDataOuterClass {
         output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList);
+        output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList);
+        output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList);
       }
       output.endObject();
     }
@@ -839,11 +839,10 @@ public final class MazeMapDataOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -407108748:
-          case 264552097: {
-            if (input.isAtField(FieldNames.contentId)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                contentId = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -863,10 +862,11 @@ public final class MazeMapDataOuterClass {
             }
             break;
           }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case -407108748:
+          case 264552097: {
+            if (input.isAtField(FieldNames.contentId)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                contentId = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -898,11 +898,11 @@ public final class MazeMapDataOuterClass {
             }
             break;
           }
-          case -337762404:
-          case 231688696: {
-            if (input.isAtField(FieldNames.unlockedChestList)) {
+          case -317054274:
+          case 407435998: {
+            if (input.isAtField(FieldNames.mazeGroupList)) {
               if (!input.trySkipNullValue()) {
-                input.readRepeatedMessage(unlockedChestList);
+                input.readRepeatedMessage(mazeGroupList);
                 bitField0_ |= 0x00000020;
               }
             } else {
@@ -922,11 +922,11 @@ public final class MazeMapDataOuterClass {
             }
             break;
           }
-          case -317054274:
-          case 407435998: {
-            if (input.isAtField(FieldNames.mazeGroupList)) {
+          case -337762404:
+          case 231688696: {
+            if (input.isAtField(FieldNames.unlockedChestList)) {
               if (!input.trySkipNullValue()) {
-                input.readRepeatedMessage(mazeGroupList);
+                input.readRepeatedMessage(unlockedChestList);
                 bitField0_ |= 0x00000080;
               }
             } else {
@@ -986,21 +986,21 @@ public final class MazeMapDataOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName contentId = FieldName.forField("contentId", "content_id");
+      static final FieldName retcode = FieldName.forField("retcode");
 
       static final FieldName entryId = FieldName.forField("entryId", "entry_id");
 
-      static final FieldName retcode = FieldName.forField("retcode");
+      static final FieldName contentId = FieldName.forField("contentId", "content_id");
 
       static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list");
 
       static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list");
 
-      static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list");
+      static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_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/MazePropOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java
index b1de2bd..bed1a7a 100644
--- a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java
@@ -19,17 +19,17 @@ public final class MazePropOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 state = 8;
+     * optional uint32 state = 3;
      */
     private int state;
 
     /**
-     * optional uint32 config_id = 14;
+     * optional uint32 config_id = 4;
      */
     private int configId;
 
     /**
-     * optional uint32 group_id = 15;
+     * optional uint32 group_id = 8;
      */
     private int groupId;
 
@@ -44,7 +44,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 state = 8;
+     * optional uint32 state = 3;
      * @return whether the state field is set
      */
     public boolean hasState() {
@@ -52,7 +52,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 state = 8;
+     * optional uint32 state = 3;
      * @return this
      */
     public MazeProp clearState() {
@@ -62,7 +62,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 state = 8;
+     * optional uint32 state = 3;
      * @return the state
      */
     public int getState() {
@@ -70,7 +70,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 state = 8;
+     * optional uint32 state = 3;
      * @param value the state to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 config_id = 14;
+     * optional uint32 config_id = 4;
      * @return whether the configId field is set
      */
     public boolean hasConfigId() {
@@ -89,7 +89,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 config_id = 14;
+     * optional uint32 config_id = 4;
      * @return this
      */
     public MazeProp clearConfigId() {
@@ -99,7 +99,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 config_id = 14;
+     * optional uint32 config_id = 4;
      * @return the configId
      */
     public int getConfigId() {
@@ -107,7 +107,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 config_id = 14;
+     * optional uint32 config_id = 4;
      * @param value the configId to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 group_id = 15;
+     * optional uint32 group_id = 8;
      * @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 = 8;
      * @return this
      */
     public MazeProp clearGroupId() {
@@ -136,7 +136,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 group_id = 15;
+     * optional uint32 group_id = 8;
      * @return the groupId
      */
     public int getGroupId() {
@@ -144,7 +144,7 @@ public final class MazePropOuterClass {
     }
 
     /**
-     * optional uint32 group_id = 15;
+     * optional uint32 group_id = 8;
      * @param value the groupId to set
      * @return this
      */
@@ -225,15 +225,15 @@ public final class MazePropOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(state);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 112);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(configId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(groupId);
       }
     }
@@ -260,25 +260,25 @@ public final class MazePropOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 64: {
+          case 24: {
             // state
             state = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 112) {
+            if (tag != 32) {
               break;
             }
           }
-          case 112: {
+          case 32: {
             // configId
             configId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 64) {
               break;
             }
           }
-          case 120: {
+          case 64: {
             // groupId
             groupId = input.readUInt32();
             bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java
index 8b8665e..de39dff 100644
--- a/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java
@@ -19,7 +19,7 @@ public final class MissionCustomValueDataOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 custom_value = 9;
+     * optional uint32 custom_value = 10;
      */
     private int customValue;
 
@@ -39,7 +39,7 @@ public final class MissionCustomValueDataOuterClass {
     }
 
     /**
-     * optional uint32 custom_value = 9;
+     * optional uint32 custom_value = 10;
      * @return whether the customValue field is set
      */
     public boolean hasCustomValue() {
@@ -47,7 +47,7 @@ public final class MissionCustomValueDataOuterClass {
     }
 
     /**
-     * optional uint32 custom_value = 9;
+     * optional uint32 custom_value = 10;
      * @return this
      */
     public MissionCustomValueData clearCustomValue() {
@@ -57,7 +57,7 @@ public final class MissionCustomValueDataOuterClass {
     }
 
     /**
-     * optional uint32 custom_value = 9;
+     * optional uint32 custom_value = 10;
      * @return the customValue
      */
     public int getCustomValue() {
@@ -65,7 +65,7 @@ public final class MissionCustomValueDataOuterClass {
     }
 
     /**
-     * optional uint32 custom_value = 9;
+     * optional uint32 custom_value = 10;
      * @param value the customValue to set
      * @return this
      */
@@ -177,7 +177,7 @@ public final class MissionCustomValueDataOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 72);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(customValue);
       }
       if ((bitField0_ & 0x00000002) != 0) {
@@ -205,7 +205,7 @@ public final class MissionCustomValueDataOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 72: {
+          case 80: {
             // customValue
             customValue = input.readUInt32();
             bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java
index 5fe9a46..6d5cbb5 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 = 2;
-     */
-    private int id;
-
-    /**
-     * optional uint32 progress = 8;
+     * optional uint32 progress = 3;
      */
     private int progress;
 
     /**
-     * optional .MissionStatus status = 1;
+     * optional uint32 id = 5;
+     */
+    private int id;
+
+    /**
+     * optional .MissionStatus status = 6;
      */
     private int status;
 
@@ -44,62 +44,25 @@ public final class MissionOuterClass {
     }
 
     /**
-     * optional uint32 id = 2;
-     * @return whether the id field is set
+     * optional uint32 progress = 3;
+     * @return whether the progress field is set
      */
-    public boolean hasId() {
+    public boolean hasProgress() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 id = 2;
-     * @return this
-     */
-    public Mission 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 Mission setId(final int value) {
-      bitField0_ |= 0x00000001;
-      id = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 progress = 8;
-     * @return whether the progress field is set
-     */
-    public boolean hasProgress() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 progress = 8;
+     * optional uint32 progress = 3;
      * @return this
      */
     public Mission clearProgress() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       progress = 0;
       return this;
     }
 
     /**
-     * optional uint32 progress = 8;
+     * optional uint32 progress = 3;
      * @return the progress
      */
     public int getProgress() {
@@ -107,18 +70,55 @@ public final class MissionOuterClass {
     }
 
     /**
-     * optional uint32 progress = 8;
+     * optional uint32 progress = 3;
      * @param value the progress to set
      * @return this
      */
     public Mission setProgress(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       progress = value;
       return this;
     }
 
     /**
-     * optional .MissionStatus status = 1;
+     * optional uint32 id = 5;
+     * @return whether the id field is set
+     */
+    public boolean hasId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 id = 5;
+     * @return this
+     */
+    public Mission clearId() {
+      bitField0_ &= ~0x00000002;
+      id = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 id = 5;
+     * @return the id
+     */
+    public int getId() {
+      return id;
+    }
+
+    /**
+     * optional uint32 id = 5;
+     * @param value the id to set
+     * @return this
+     */
+    public Mission setId(final int value) {
+      bitField0_ |= 0x00000002;
+      id = value;
+      return this;
+    }
+
+    /**
+     * 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 = 1;
+     * optional .MissionStatus status = 6;
      * @return this
      */
     public Mission clearStatus() {
@@ -136,7 +136,7 @@ public final class MissionOuterClass {
     }
 
     /**
-     * optional .MissionStatus status = 1;
+     * optional .MissionStatus status = 6;
      * @return the status
      */
     public MissionStatusOuterClass.MissionStatus getStatus() {
@@ -169,7 +169,7 @@ public final class MissionOuterClass {
     }
 
     /**
-     * optional .MissionStatus status = 1;
+     * optional .MissionStatus status = 6;
      * @param value the status to set
      * @return this
      */
@@ -184,8 +184,8 @@ public final class MissionOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        id = other.id;
         progress = other.progress;
+        id = other.id;
         status = other.status;
       }
       return this;
@@ -197,12 +197,12 @@ public final class MissionOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasId()) {
-        setId(other.id);
-      }
       if (other.hasProgress()) {
         setProgress(other.progress);
       }
+      if (other.hasId()) {
+        setId(other.id);
+      }
       if (other.hasStatus()) {
         setStatusValue(other.status);
       }
@@ -216,8 +216,8 @@ public final class MissionOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      id = 0;
       progress = 0;
+      id = 0;
       status = 0;
       return this;
     }
@@ -242,23 +242,23 @@ public final class MissionOuterClass {
       }
       Mission other = (Mission) o;
       return bitField0_ == other.bitField0_
-        && (!hasId() || id == other.id)
         && (!hasProgress() || progress == other.progress)
+        && (!hasId() || id == other.id)
         && (!hasStatus() || status == other.status);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
-        output.writeUInt32NoTag(id);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(progress);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 40);
+        output.writeUInt32NoTag(id);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 48);
         output.writeEnumNoTag(status);
       }
     }
@@ -267,10 +267,10 @@ public final class MissionOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeEnumSizeNoTag(status);
@@ -285,25 +285,25 @@ public final class MissionOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
-            // id
-            id = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 64) {
-              break;
-            }
-          }
-          case 64: {
+          case 24: {
             // progress
             progress = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 8) {
+            if (tag != 40) {
               break;
             }
           }
-          case 8: {
+          case 40: {
+            // id
+            id = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 48) {
+              break;
+            }
+          }
+          case 48: {
             // status
             final int value = input.readInt32();
             if (MissionStatusOuterClass.MissionStatus.forNumber(value) != null) {
@@ -333,10 +333,10 @@ public final class MissionOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.id, id);
+        output.writeUInt32(FieldNames.progress, progress);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.progress, progress);
+        output.writeUInt32(FieldNames.id, id);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeEnum(FieldNames.status, status, MissionStatusOuterClass.MissionStatus.converter());
@@ -351,10 +351,10 @@ public final class MissionOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 3355: {
-            if (input.isAtField(FieldNames.id)) {
+          case -1001078227: {
+            if (input.isAtField(FieldNames.progress)) {
               if (!input.trySkipNullValue()) {
-                id = input.readUInt32();
+                progress = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -362,10 +362,10 @@ public final class MissionOuterClass {
             }
             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 MissionOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName id = FieldName.forField("id");
-
       static final FieldName progress = FieldName.forField("progress");
 
+      static final FieldName id = FieldName.forField("id");
+
       static final FieldName status = FieldName.forField("status");
     }
   }
diff --git a/src/generated/main/emu/lunarcore/proto/MissionStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionStatusOuterClass.java
index ffd31d7..84ea33e 100644
--- a/src/generated/main/emu/lunarcore/proto/MissionStatusOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MissionStatusOuterClass.java
@@ -77,7 +77,7 @@ public final class MissionStatusOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return MissionStatusConverter.INSTANCE;
     }
 
@@ -99,7 +99,7 @@ public final class MissionStatusOuterClass {
       return value == null ? other : value;
     }
 
-    enum MissionStatusConverter implements EnumConverter {
+    enum MissionStatusConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       private static final MissionStatus[] lookup = new MissionStatus[4];
diff --git a/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java
index daead16..0e1756f 100644
--- a/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java
@@ -22,7 +22,7 @@ public final class MissionSyncOuterClass {
 
     /**
      * 
-     *  could be also 10
+     *  could be also 10 or 6
      * 

      *
      * repeated uint32 main_mission_id = 1;
@@ -30,7 +30,7 @@ public final class MissionSyncOuterClass {
     private final RepeatedInt mainMissionId = RepeatedInt.newEmptyInstance();
 
     /**
-     * repeated .Mission mission_list = 3;
+     * repeated .Mission mission_list = 12;
      */
     private final RepeatedMessage missionList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory());
 
@@ -46,7 +46,7 @@ public final class MissionSyncOuterClass {
 
     /**
      * 
-     *  could be also 10
+     *  could be also 10 or 6
      * 

      *
      * repeated uint32 main_mission_id = 1;
@@ -58,7 +58,7 @@ public final class MissionSyncOuterClass {
 
     /**
      * 
-     *  could be also 10
+     *  could be also 10 or 6
      * 

      *
      * repeated uint32 main_mission_id = 1;
@@ -72,7 +72,7 @@ public final class MissionSyncOuterClass {
 
     /**
      * 
-     *  could be also 10
+     *  could be also 10 or 6
      * 

      *
      * repeated uint32 main_mission_id = 1;
@@ -90,7 +90,7 @@ public final class MissionSyncOuterClass {
 
     /**
      * 
-     *  could be also 10
+     *  could be also 10 or 6
      * 

      *
      * repeated uint32 main_mission_id = 1;
@@ -108,7 +108,7 @@ public final class MissionSyncOuterClass {
 
     /**
      * 
-     *  could be also 10
+     *  could be also 10 or 6
      * 

      *
      * repeated uint32 main_mission_id = 1;
@@ -123,7 +123,7 @@ public final class MissionSyncOuterClass {
 
     /**
      * 
-     *  could be also 10
+     *  could be also 10 or 6
      * 

      *
      * repeated uint32 main_mission_id = 1;
@@ -137,7 +137,7 @@ public final class MissionSyncOuterClass {
     }
 
     /**
-     * repeated .Mission mission_list = 3;
+     * repeated .Mission mission_list = 12;
      * @return whether the missionList field is set
      */
     public boolean hasMissionList() {
@@ -145,7 +145,7 @@ public final class MissionSyncOuterClass {
     }
 
     /**
-     * repeated .Mission mission_list = 3;
+     * repeated .Mission mission_list = 12;
      * @return this
      */
     public MissionSync clearMissionList() {
@@ -155,7 +155,7 @@ public final class MissionSyncOuterClass {
     }
 
     /**
-     * repeated .Mission mission_list = 3;
+     * repeated .Mission mission_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.
@@ -169,7 +169,7 @@ public final class MissionSyncOuterClass {
     }
 
     /**
-     * repeated .Mission mission_list = 3;
+     * repeated .Mission mission_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
@@ -183,7 +183,7 @@ public final class MissionSyncOuterClass {
     }
 
     /**
-     * repeated .Mission mission_list = 3;
+     * repeated .Mission mission_list = 12;
      * @param value the missionList to add
      * @return this
      */
@@ -194,7 +194,7 @@ public final class MissionSyncOuterClass {
     }
 
     /**
-     * repeated .Mission mission_list = 3;
+     * repeated .Mission mission_list = 12;
      * @param values the missionList to add
      * @return this
      */
@@ -278,7 +278,7 @@ public final class MissionSyncOuterClass {
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < missionList.length(); i++) {
-          output.writeRawByte((byte) 26);
+          output.writeRawByte((byte) 98);
           output.writeMessageNoTag(missionList.get(i));
         }
       }
@@ -308,11 +308,11 @@ public final class MissionSyncOuterClass {
             input.readPackedUInt32(mainMissionId, tag);
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 26) {
+            if (tag != 98) {
               break;
             }
           }
-          case 26: {
+          case 98: {
             // missionList
             tag = input.readRepeatedMessage(missionList, tag);
             bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java
index 9094f6e..be99583 100644
--- a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java
@@ -19,15 +19,15 @@ public final class MonsterArchiveOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 monster_id = 1;
-     */
-    private int monsterId;
-
-    /**
-     * optional uint32 num = 2;
+     * optional uint32 num = 3;
      */
     private int num;
 
+    /**
+     * optional uint32 monster_id = 9;
+     */
+    private int monsterId;
+
     private MonsterArchive() {
     }
 
@@ -39,62 +39,25 @@ public final class MonsterArchiveOuterClass {
     }
 
     /**
-     * optional uint32 monster_id = 1;
-     * @return whether the monsterId field is set
+     * optional uint32 num = 3;
+     * @return whether the num field is set
      */
-    public boolean hasMonsterId() {
+    public boolean hasNum() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 monster_id = 1;
-     * @return this
-     */
-    public MonsterArchive clearMonsterId() {
-      bitField0_ &= ~0x00000001;
-      monsterId = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 monster_id = 1;
-     * @return the monsterId
-     */
-    public int getMonsterId() {
-      return monsterId;
-    }
-
-    /**
-     * optional uint32 monster_id = 1;
-     * @param value the monsterId to set
-     * @return this
-     */
-    public MonsterArchive setMonsterId(final int value) {
-      bitField0_ |= 0x00000001;
-      monsterId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 num = 2;
-     * @return whether the num field is set
-     */
-    public boolean hasNum() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 num = 2;
+     * optional uint32 num = 3;
      * @return this
      */
     public MonsterArchive clearNum() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       num = 0;
       return this;
     }
 
     /**
-     * optional uint32 num = 2;
+     * optional uint32 num = 3;
      * @return the num
      */
     public int getNum() {
@@ -102,23 +65,60 @@ public final class MonsterArchiveOuterClass {
     }
 
     /**
-     * optional uint32 num = 2;
+     * optional uint32 num = 3;
      * @param value the num to set
      * @return this
      */
     public MonsterArchive setNum(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       num = value;
       return this;
     }
 
+    /**
+     * optional uint32 monster_id = 9;
+     * @return whether the monsterId field is set
+     */
+    public boolean hasMonsterId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 monster_id = 9;
+     * @return this
+     */
+    public MonsterArchive clearMonsterId() {
+      bitField0_ &= ~0x00000002;
+      monsterId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 monster_id = 9;
+     * @return the monsterId
+     */
+    public int getMonsterId() {
+      return monsterId;
+    }
+
+    /**
+     * optional uint32 monster_id = 9;
+     * @param value the monsterId to set
+     * @return this
+     */
+    public MonsterArchive setMonsterId(final int value) {
+      bitField0_ |= 0x00000002;
+      monsterId = value;
+      return this;
+    }
+
     @Override
     public MonsterArchive copyFrom(final MonsterArchive other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        monsterId = other.monsterId;
         num = other.num;
+        monsterId = other.monsterId;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class MonsterArchiveOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasMonsterId()) {
-        setMonsterId(other.monsterId);
-      }
       if (other.hasNum()) {
         setNum(other.num);
       }
+      if (other.hasMonsterId()) {
+        setMonsterId(other.monsterId);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class MonsterArchiveOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      monsterId = 0;
       num = 0;
+      monsterId = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class MonsterArchiveOuterClass {
       }
       MonsterArchive other = (MonsterArchive) o;
       return bitField0_ == other.bitField0_
-        && (!hasMonsterId() || monsterId == other.monsterId)
-        && (!hasNum() || num == other.num);
+        && (!hasNum() || num == other.num)
+        && (!hasMonsterId() || monsterId == other.monsterId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeUInt32NoTag(monsterId);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(num);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 16);
-        output.writeUInt32NoTag(num);
+        output.writeRawByte((byte) 72);
+        output.writeUInt32NoTag(monsterId);
       }
     }
 
@@ -190,10 +190,10 @@ public final class MonsterArchiveOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class MonsterArchiveOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
-            // monsterId
-            monsterId = input.readUInt32();
+          case 24: {
+            // num
+            num = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 16) {
+            if (tag != 72) {
               break;
             }
           }
-          case 16: {
-            // num
-            num = input.readUInt32();
+          case 72: {
+            // monsterId
+            monsterId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class MonsterArchiveOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.monsterId, monsterId);
+        output.writeUInt32(FieldNames.num, num);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.num, num);
+        output.writeUInt32(FieldNames.monsterId, monsterId);
       }
       output.endObject();
     }
@@ -256,11 +256,10 @@ public final class MonsterArchiveOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -1316830571:
-          case 2127946656: {
-            if (input.isAtField(FieldNames.monsterId)) {
+          case 109446: {
+            if (input.isAtField(FieldNames.num)) {
               if (!input.trySkipNullValue()) {
-                monsterId = input.readUInt32();
+                num = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -268,10 +267,11 @@ public final class MonsterArchiveOuterClass {
             }
             break;
           }
-          case 109446: {
-            if (input.isAtField(FieldNames.num)) {
+          case -1316830571:
+          case 2127946656: {
+            if (input.isAtField(FieldNames.monsterId)) {
               if (!input.trySkipNullValue()) {
-                num = input.readUInt32();
+                monsterId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -332,9 +332,9 @@ public final class MonsterArchiveOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName monsterId = FieldName.forField("monsterId", "monster_id");
-
       static final FieldName num = FieldName.forField("num");
+
+      static final FieldName monsterId = FieldName.forField("monsterId", "monster_id");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java
index 31b28d5..9dad986 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 pos = 5;
-     */
-    private final VectorOuterClass.Vector pos = VectorOuterClass.Vector.newInstance();
-
-    /**
-     * optional .Vector rot = 11;
+     * optional .Vector rot = 13;
      */
     private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance();
 
+    /**
+     * optional .Vector pos = 14;
+     */
+    private final VectorOuterClass.Vector pos = VectorOuterClass.Vector.newInstance();
+
     private MotionInfo() {
     }
 
@@ -39,82 +39,25 @@ public final class MotionInfoOuterClass {
     }
 
     /**
-     * optional .Vector pos = 5;
-     * @return whether the pos field is set
+     * optional .Vector rot = 13;
+     * @return whether the rot field is set
      */
-    public boolean hasPos() {
+    public boolean hasRot() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional .Vector pos = 5;
-     * @return this
-     */
-    public MotionInfo clearPos() {
-      bitField0_ &= ~0x00000001;
-      pos.clear();
-      return this;
-    }
-
-    /**
-     * optional .Vector pos = 5;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutablePos()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public VectorOuterClass.Vector getPos() {
-      return pos;
-    }
-
-    /**
-     * optional .Vector pos = 5;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public VectorOuterClass.Vector getMutablePos() {
-      bitField0_ |= 0x00000001;
-      return pos;
-    }
-
-    /**
-     * optional .Vector pos = 5;
-     * @param value the pos to set
-     * @return this
-     */
-    public MotionInfo setPos(final VectorOuterClass.Vector value) {
-      bitField0_ |= 0x00000001;
-      pos.copyFrom(value);
-      return this;
-    }
-
-    /**
-     * optional .Vector rot = 11;
-     * @return whether the rot field is set
-     */
-    public boolean hasRot() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional .Vector rot = 11;
+     * optional .Vector rot = 13;
      * @return this
      */
     public MotionInfo clearRot() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       rot.clear();
       return this;
     }
 
     /**
-     * optional .Vector rot = 11;
+     * optional .Vector rot = 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.
@@ -128,7 +71,7 @@ public final class MotionInfoOuterClass {
     }
 
     /**
-     * optional .Vector rot = 11;
+     * optional .Vector rot = 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
@@ -137,28 +80,85 @@ public final class MotionInfoOuterClass {
      * @return internal storage object for modifications
      */
     public VectorOuterClass.Vector getMutableRot() {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       return rot;
     }
 
     /**
-     * optional .Vector rot = 11;
+     * optional .Vector rot = 13;
      * @param value the rot to set
      * @return this
      */
     public MotionInfo setRot(final VectorOuterClass.Vector value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       rot.copyFrom(value);
       return this;
     }
 
+    /**
+     * optional .Vector pos = 14;
+     * @return whether the pos field is set
+     */
+    public boolean hasPos() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional .Vector pos = 14;
+     * @return this
+     */
+    public MotionInfo clearPos() {
+      bitField0_ &= ~0x00000002;
+      pos.clear();
+      return this;
+    }
+
+    /**
+     * optional .Vector pos = 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 #getMutablePos()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public VectorOuterClass.Vector getPos() {
+      return pos;
+    }
+
+    /**
+     * optional .Vector pos = 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 getMutablePos() {
+      bitField0_ |= 0x00000002;
+      return pos;
+    }
+
+    /**
+     * optional .Vector pos = 14;
+     * @param value the pos to set
+     * @return this
+     */
+    public MotionInfo setPos(final VectorOuterClass.Vector value) {
+      bitField0_ |= 0x00000002;
+      pos.copyFrom(value);
+      return this;
+    }
+
     @Override
     public MotionInfo copyFrom(final MotionInfo other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        pos.copyFrom(other.pos);
         rot.copyFrom(other.rot);
+        pos.copyFrom(other.pos);
       }
       return this;
     }
@@ -169,12 +169,12 @@ public final class MotionInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasPos()) {
-        getMutablePos().mergeFrom(other.pos);
-      }
       if (other.hasRot()) {
         getMutableRot().mergeFrom(other.rot);
       }
+      if (other.hasPos()) {
+        getMutablePos().mergeFrom(other.pos);
+      }
       return this;
     }
 
@@ -185,8 +185,8 @@ public final class MotionInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      pos.clear();
       rot.clear();
+      pos.clear();
       return this;
     }
 
@@ -197,8 +197,8 @@ public final class MotionInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      pos.clearQuick();
       rot.clearQuick();
+      pos.clearQuick();
       return this;
     }
 
@@ -212,19 +212,19 @@ public final class MotionInfoOuterClass {
       }
       MotionInfo other = (MotionInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasPos() || pos.equals(other.pos))
-        && (!hasRot() || rot.equals(other.rot));
+        && (!hasRot() || rot.equals(other.rot))
+        && (!hasPos() || pos.equals(other.pos));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 42);
-        output.writeMessageNoTag(pos);
+        output.writeRawByte((byte) 106);
+        output.writeMessageNoTag(rot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 90);
-        output.writeMessageNoTag(rot);
+        output.writeRawByte((byte) 114);
+        output.writeMessageNoTag(pos);
       }
     }
 
@@ -232,10 +232,10 @@ public final class MotionInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(pos);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(rot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(rot);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(pos);
       }
       return size;
     }
@@ -247,18 +247,18 @@ public final class MotionInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 42: {
-            // pos
-            input.readMessage(pos);
+          case 106: {
+            // rot
+            input.readMessage(rot);
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 114) {
               break;
             }
           }
-          case 90: {
-            // rot
-            input.readMessage(rot);
+          case 114: {
+            // pos
+            input.readMessage(pos);
             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.pos, pos);
+        output.writeMessage(FieldNames.rot, rot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeMessage(FieldNames.rot, rot);
+        output.writeMessage(FieldNames.pos, pos);
       }
       output.endObject();
     }
@@ -298,10 +298,10 @@ public final class MotionInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 111188: {
-            if (input.isAtField(FieldNames.pos)) {
+          case 113111: {
+            if (input.isAtField(FieldNames.rot)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(pos);
+                input.readMessage(rot);
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -309,10 +309,10 @@ public final class MotionInfoOuterClass {
             }
             break;
           }
-          case 113111: {
-            if (input.isAtField(FieldNames.rot)) {
+          case 111188: {
+            if (input.isAtField(FieldNames.pos)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(rot);
+                input.readMessage(pos);
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -372,9 +372,9 @@ public final class MotionInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName pos = FieldName.forField("pos");
-
       static final FieldName rot = FieldName.forField("rot");
+
+      static final FieldName pos = FieldName.forField("pos");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/MsgTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/MsgTypeOuterClass.java
index 6a7ac49..986be24 100644
--- a/src/generated/main/emu/lunarcore/proto/MsgTypeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MsgTypeOuterClass.java
@@ -67,7 +67,7 @@ public final class MsgTypeOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return MsgTypeConverter.INSTANCE;
     }
 
@@ -89,7 +89,7 @@ public final class MsgTypeOuterClass {
       return value == null ? other : value;
     }
 
-    enum MsgTypeConverter implements EnumConverter {
+    enum MsgTypeConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       private static final MsgType[] lookup = new MsgType[3];
diff --git a/src/generated/main/emu/lunarcore/proto/MultiPathAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MultiPathAvatarInfoOuterClass.java
index e78f09e..1678190 100644
--- a/src/generated/main/emu/lunarcore/proto/MultiPathAvatarInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MultiPathAvatarInfoOuterClass.java
@@ -10,7 +10,6 @@ import us.hebi.quickbuf.MessageFactory;
 import us.hebi.quickbuf.ProtoMessage;
 import us.hebi.quickbuf.ProtoSink;
 import us.hebi.quickbuf.ProtoSource;
-import us.hebi.quickbuf.RepeatedInt;
 import us.hebi.quickbuf.RepeatedMessage;
 
 public final class MultiPathAvatarInfoOuterClass {
@@ -21,39 +20,29 @@ public final class MultiPathAvatarInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 path_equipment_id = 9;
-     */
-    private int pathEquipmentId;
-
-    /**
-     * optional uint32 rank = 12;
+     * optional uint32 rank = 7;
      */
     private int rank;
 
     /**
-     * optional .MultiPathAvatarType avatar_id = 11;
+     * optional uint32 path_equipment_id = 10;
+     */
+    private int pathEquipmentId;
+
+    /**
+     * optional .MultiPathAvatarType avatar_id = 2;
      */
     private int avatarId;
 
     /**
-     * repeated uint32 unlocked_special_point_id_list = 15;
-     */
-    private final RepeatedInt unlockedSpecialPointIdList = RepeatedInt.newEmptyInstance();
-
-    /**
-     * repeated .AvatarSkillTree multi_path_skill_tree = 5;
-     */
-    private final RepeatedMessage multiPathSkillTree = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory());
-
-    /**
-     * repeated .EquipRelic equip_relic_list = 13;
+     * repeated .EquipRelic equip_relic_list = 3;
      */
     private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory());
 
     /**
-     * repeated .AvatarSkillTree special_skilltree_list = 14;
+     * repeated .AvatarSkillTree multi_path_skill_tree = 4;
      */
-    private final RepeatedMessage specialSkilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory());
+    private final RepeatedMessage multiPathSkillTree = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory());
 
     private MultiPathAvatarInfo() {
     }
@@ -66,62 +55,25 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * optional uint32 path_equipment_id = 9;
-     * @return whether the pathEquipmentId field is set
+     * optional uint32 rank = 7;
+     * @return whether the rank field is set
      */
-    public boolean hasPathEquipmentId() {
+    public boolean hasRank() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 path_equipment_id = 9;
-     * @return this
-     */
-    public MultiPathAvatarInfo clearPathEquipmentId() {
-      bitField0_ &= ~0x00000001;
-      pathEquipmentId = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 path_equipment_id = 9;
-     * @return the pathEquipmentId
-     */
-    public int getPathEquipmentId() {
-      return pathEquipmentId;
-    }
-
-    /**
-     * optional uint32 path_equipment_id = 9;
-     * @param value the pathEquipmentId to set
-     * @return this
-     */
-    public MultiPathAvatarInfo setPathEquipmentId(final int value) {
-      bitField0_ |= 0x00000001;
-      pathEquipmentId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 rank = 12;
-     * @return whether the rank field is set
-     */
-    public boolean hasRank() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 rank = 12;
+     * optional uint32 rank = 7;
      * @return this
      */
     public MultiPathAvatarInfo clearRank() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       rank = 0;
       return this;
     }
 
     /**
-     * optional uint32 rank = 12;
+     * optional uint32 rank = 7;
      * @return the rank
      */
     public int getRank() {
@@ -129,18 +81,55 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * optional uint32 rank = 12;
+     * optional uint32 rank = 7;
      * @param value the rank to set
      * @return this
      */
     public MultiPathAvatarInfo setRank(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       rank = value;
       return this;
     }
 
     /**
-     * optional .MultiPathAvatarType avatar_id = 11;
+     * optional uint32 path_equipment_id = 10;
+     * @return whether the pathEquipmentId field is set
+     */
+    public boolean hasPathEquipmentId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 path_equipment_id = 10;
+     * @return this
+     */
+    public MultiPathAvatarInfo clearPathEquipmentId() {
+      bitField0_ &= ~0x00000002;
+      pathEquipmentId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 path_equipment_id = 10;
+     * @return the pathEquipmentId
+     */
+    public int getPathEquipmentId() {
+      return pathEquipmentId;
+    }
+
+    /**
+     * optional uint32 path_equipment_id = 10;
+     * @param value the pathEquipmentId to set
+     * @return this
+     */
+    public MultiPathAvatarInfo setPathEquipmentId(final int value) {
+      bitField0_ |= 0x00000002;
+      pathEquipmentId = value;
+      return this;
+    }
+
+    /**
+     * optional .MultiPathAvatarType avatar_id = 2;
      * @return whether the avatarId field is set
      */
     public boolean hasAvatarId() {
@@ -148,7 +137,7 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * optional .MultiPathAvatarType avatar_id = 11;
+     * optional .MultiPathAvatarType avatar_id = 2;
      * @return this
      */
     public MultiPathAvatarInfo clearAvatarId() {
@@ -158,7 +147,7 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * optional .MultiPathAvatarType avatar_id = 11;
+     * optional .MultiPathAvatarType avatar_id = 2;
      * @return the avatarId
      */
     public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getAvatarId() {
@@ -191,7 +180,7 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * optional .MultiPathAvatarType avatar_id = 11;
+     * optional .MultiPathAvatarType avatar_id = 2;
      * @param value the avatarId to set
      * @return this
      */
@@ -203,39 +192,39 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * repeated uint32 unlocked_special_point_id_list = 15;
-     * @return whether the unlockedSpecialPointIdList field is set
+     * repeated .EquipRelic equip_relic_list = 3;
+     * @return whether the equipRelicList field is set
      */
-    public boolean hasUnlockedSpecialPointIdList() {
+    public boolean hasEquipRelicList() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * repeated uint32 unlocked_special_point_id_list = 15;
+     * repeated .EquipRelic equip_relic_list = 3;
      * @return this
      */
-    public MultiPathAvatarInfo clearUnlockedSpecialPointIdList() {
+    public MultiPathAvatarInfo clearEquipRelicList() {
       bitField0_ &= ~0x00000008;
-      unlockedSpecialPointIdList.clear();
+      equipRelicList.clear();
       return this;
     }
 
     /**
-     * repeated uint32 unlocked_special_point_id_list = 15;
+     * repeated .EquipRelic equip_relic_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 #getMutableUnlockedSpecialPointIdList()} if you want to modify it.
+     * Use {@link #getMutableEquipRelicList()} if you want to modify it.
      *
      * @return internal storage object for reading
      */
-    public RepeatedInt getUnlockedSpecialPointIdList() {
-      return unlockedSpecialPointIdList;
+    public RepeatedMessage getEquipRelicList() {
+      return equipRelicList;
     }
 
     /**
-     * repeated uint32 unlocked_special_point_id_list = 15;
+     * repeated .EquipRelic equip_relic_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
@@ -243,35 +232,36 @@ public final class MultiPathAvatarInfoOuterClass {
      *
      * @return internal storage object for modifications
      */
-    public RepeatedInt getMutableUnlockedSpecialPointIdList() {
+    public RepeatedMessage getMutableEquipRelicList() {
       bitField0_ |= 0x00000008;
-      return unlockedSpecialPointIdList;
+      return equipRelicList;
     }
 
     /**
-     * repeated uint32 unlocked_special_point_id_list = 15;
-     * @param value the unlockedSpecialPointIdList to add
+     * repeated .EquipRelic equip_relic_list = 3;
+     * @param value the equipRelicList to add
      * @return this
      */
-    public MultiPathAvatarInfo addUnlockedSpecialPointIdList(final int value) {
+    public MultiPathAvatarInfo addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) {
       bitField0_ |= 0x00000008;
-      unlockedSpecialPointIdList.add(value);
+      equipRelicList.add(value);
       return this;
     }
 
     /**
-     * repeated uint32 unlocked_special_point_id_list = 15;
-     * @param values the unlockedSpecialPointIdList to add
+     * repeated .EquipRelic equip_relic_list = 3;
+     * @param values the equipRelicList to add
      * @return this
      */
-    public MultiPathAvatarInfo addAllUnlockedSpecialPointIdList(final int... values) {
+    public MultiPathAvatarInfo addAllEquipRelicList(
+        final EquipRelicOuterClass.EquipRelic... values) {
       bitField0_ |= 0x00000008;
-      unlockedSpecialPointIdList.addAll(values);
+      equipRelicList.addAll(values);
       return this;
     }
 
     /**
-     * repeated .AvatarSkillTree multi_path_skill_tree = 5;
+     * repeated .AvatarSkillTree multi_path_skill_tree = 4;
      * @return whether the multiPathSkillTree field is set
      */
     public boolean hasMultiPathSkillTree() {
@@ -279,7 +269,7 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * repeated .AvatarSkillTree multi_path_skill_tree = 5;
+     * repeated .AvatarSkillTree multi_path_skill_tree = 4;
      * @return this
      */
     public MultiPathAvatarInfo clearMultiPathSkillTree() {
@@ -289,7 +279,7 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * repeated .AvatarSkillTree multi_path_skill_tree = 5;
+     * repeated .AvatarSkillTree multi_path_skill_tree = 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.
@@ -303,7 +293,7 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * repeated .AvatarSkillTree multi_path_skill_tree = 5;
+     * repeated .AvatarSkillTree multi_path_skill_tree = 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
@@ -318,7 +308,7 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * repeated .AvatarSkillTree multi_path_skill_tree = 5;
+     * repeated .AvatarSkillTree multi_path_skill_tree = 4;
      * @param value the multiPathSkillTree to add
      * @return this
      */
@@ -330,7 +320,7 @@ public final class MultiPathAvatarInfoOuterClass {
     }
 
     /**
-     * repeated .AvatarSkillTree multi_path_skill_tree = 5;
+     * repeated .AvatarSkillTree multi_path_skill_tree = 4;
      * @param values the multiPathSkillTree to add
      * @return this
      */
@@ -341,158 +331,16 @@ public final class MultiPathAvatarInfoOuterClass {
       return this;
     }
 
-    /**
-     * repeated .EquipRelic equip_relic_list = 13;
-     * @return whether the equipRelicList field is set
-     */
-    public boolean hasEquipRelicList() {
-      return (bitField0_ & 0x00000020) != 0;
-    }
-
-    /**
-     * repeated .EquipRelic equip_relic_list = 13;
-     * @return this
-     */
-    public MultiPathAvatarInfo clearEquipRelicList() {
-      bitField0_ &= ~0x00000020;
-      equipRelicList.clear();
-      return this;
-    }
-
-    /**
-     * repeated .EquipRelic equip_relic_list = 13;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableEquipRelicList()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RepeatedMessage getEquipRelicList() {
-      return equipRelicList;
-    }
-
-    /**
-     * repeated .EquipRelic equip_relic_list = 13;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public RepeatedMessage getMutableEquipRelicList() {
-      bitField0_ |= 0x00000020;
-      return equipRelicList;
-    }
-
-    /**
-     * repeated .EquipRelic equip_relic_list = 13;
-     * @param value the equipRelicList to add
-     * @return this
-     */
-    public MultiPathAvatarInfo addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) {
-      bitField0_ |= 0x00000020;
-      equipRelicList.add(value);
-      return this;
-    }
-
-    /**
-     * repeated .EquipRelic equip_relic_list = 13;
-     * @param values the equipRelicList to add
-     * @return this
-     */
-    public MultiPathAvatarInfo addAllEquipRelicList(
-        final EquipRelicOuterClass.EquipRelic... values) {
-      bitField0_ |= 0x00000020;
-      equipRelicList.addAll(values);
-      return this;
-    }
-
-    /**
-     * repeated .AvatarSkillTree special_skilltree_list = 14;
-     * @return whether the specialSkilltreeList field is set
-     */
-    public boolean hasSpecialSkilltreeList() {
-      return (bitField0_ & 0x00000040) != 0;
-    }
-
-    /**
-     * repeated .AvatarSkillTree special_skilltree_list = 14;
-     * @return this
-     */
-    public MultiPathAvatarInfo clearSpecialSkilltreeList() {
-      bitField0_ &= ~0x00000040;
-      specialSkilltreeList.clear();
-      return this;
-    }
-
-    /**
-     * repeated .AvatarSkillTree special_skilltree_list = 14;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableSpecialSkilltreeList()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RepeatedMessage getSpecialSkilltreeList() {
-      return specialSkilltreeList;
-    }
-
-    /**
-     * repeated .AvatarSkillTree special_skilltree_list = 14;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public RepeatedMessage getMutableSpecialSkilltreeList(
-        ) {
-      bitField0_ |= 0x00000040;
-      return specialSkilltreeList;
-    }
-
-    /**
-     * repeated .AvatarSkillTree special_skilltree_list = 14;
-     * @param value the specialSkilltreeList to add
-     * @return this
-     */
-    public MultiPathAvatarInfo addSpecialSkilltreeList(
-        final AvatarSkillTreeOuterClass.AvatarSkillTree value) {
-      bitField0_ |= 0x00000040;
-      specialSkilltreeList.add(value);
-      return this;
-    }
-
-    /**
-     * repeated .AvatarSkillTree special_skilltree_list = 14;
-     * @param values the specialSkilltreeList to add
-     * @return this
-     */
-    public MultiPathAvatarInfo addAllSpecialSkilltreeList(
-        final AvatarSkillTreeOuterClass.AvatarSkillTree... values) {
-      bitField0_ |= 0x00000040;
-      specialSkilltreeList.addAll(values);
-      return this;
-    }
-
     @Override
     public MultiPathAvatarInfo copyFrom(final MultiPathAvatarInfo other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        pathEquipmentId = other.pathEquipmentId;
         rank = other.rank;
+        pathEquipmentId = other.pathEquipmentId;
         avatarId = other.avatarId;
-        unlockedSpecialPointIdList.copyFrom(other.unlockedSpecialPointIdList);
-        multiPathSkillTree.copyFrom(other.multiPathSkillTree);
         equipRelicList.copyFrom(other.equipRelicList);
-        specialSkilltreeList.copyFrom(other.specialSkilltreeList);
+        multiPathSkillTree.copyFrom(other.multiPathSkillTree);
       }
       return this;
     }
@@ -503,26 +351,20 @@ public final class MultiPathAvatarInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasPathEquipmentId()) {
-        setPathEquipmentId(other.pathEquipmentId);
-      }
       if (other.hasRank()) {
         setRank(other.rank);
       }
+      if (other.hasPathEquipmentId()) {
+        setPathEquipmentId(other.pathEquipmentId);
+      }
       if (other.hasAvatarId()) {
         setAvatarIdValue(other.avatarId);
       }
-      if (other.hasUnlockedSpecialPointIdList()) {
-        getMutableUnlockedSpecialPointIdList().addAll(other.unlockedSpecialPointIdList);
-      }
-      if (other.hasMultiPathSkillTree()) {
-        getMutableMultiPathSkillTree().addAll(other.multiPathSkillTree);
-      }
       if (other.hasEquipRelicList()) {
         getMutableEquipRelicList().addAll(other.equipRelicList);
       }
-      if (other.hasSpecialSkilltreeList()) {
-        getMutableSpecialSkilltreeList().addAll(other.specialSkilltreeList);
+      if (other.hasMultiPathSkillTree()) {
+        getMutableMultiPathSkillTree().addAll(other.multiPathSkillTree);
       }
       return this;
     }
@@ -534,13 +376,11 @@ public final class MultiPathAvatarInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      pathEquipmentId = 0;
       rank = 0;
+      pathEquipmentId = 0;
       avatarId = 0;
-      unlockedSpecialPointIdList.clear();
-      multiPathSkillTree.clear();
       equipRelicList.clear();
-      specialSkilltreeList.clear();
+      multiPathSkillTree.clear();
       return this;
     }
 
@@ -551,10 +391,8 @@ public final class MultiPathAvatarInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      unlockedSpecialPointIdList.clear();
-      multiPathSkillTree.clearQuick();
       equipRelicList.clearQuick();
-      specialSkilltreeList.clearQuick();
+      multiPathSkillTree.clearQuick();
       return this;
     }
 
@@ -568,79 +406,59 @@ public final class MultiPathAvatarInfoOuterClass {
       }
       MultiPathAvatarInfo other = (MultiPathAvatarInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasPathEquipmentId() || pathEquipmentId == other.pathEquipmentId)
         && (!hasRank() || rank == other.rank)
+        && (!hasPathEquipmentId() || pathEquipmentId == other.pathEquipmentId)
         && (!hasAvatarId() || avatarId == other.avatarId)
-        && (!hasUnlockedSpecialPointIdList() || unlockedSpecialPointIdList.equals(other.unlockedSpecialPointIdList))
-        && (!hasMultiPathSkillTree() || multiPathSkillTree.equals(other.multiPathSkillTree))
         && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList))
-        && (!hasSpecialSkilltreeList() || specialSkilltreeList.equals(other.specialSkilltreeList));
+        && (!hasMultiPathSkillTree() || multiPathSkillTree.equals(other.multiPathSkillTree));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(pathEquipmentId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 56);
         output.writeUInt32NoTag(rank);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(pathEquipmentId);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 16);
         output.writeEnumNoTag(avatarId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        for (int i = 0; i < unlockedSpecialPointIdList.length(); i++) {
-          output.writeRawByte((byte) 120);
-          output.writeUInt32NoTag(unlockedSpecialPointIdList.array()[i]);
+        for (int i = 0; i < equipRelicList.length(); i++) {
+          output.writeRawByte((byte) 26);
+          output.writeMessageNoTag(equipRelicList.get(i));
         }
       }
       if ((bitField0_ & 0x00000010) != 0) {
         for (int i = 0; i < multiPathSkillTree.length(); i++) {
-          output.writeRawByte((byte) 42);
+          output.writeRawByte((byte) 34);
           output.writeMessageNoTag(multiPathSkillTree.get(i));
         }
       }
-      if ((bitField0_ & 0x00000020) != 0) {
-        for (int i = 0; i < equipRelicList.length(); i++) {
-          output.writeRawByte((byte) 106);
-          output.writeMessageNoTag(equipRelicList.get(i));
-        }
-      }
-      if ((bitField0_ & 0x00000040) != 0) {
-        for (int i = 0; i < specialSkilltreeList.length(); i++) {
-          output.writeRawByte((byte) 114);
-          output.writeMessageNoTag(specialSkilltreeList.get(i));
-        }
-      }
     }
 
     @Override
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(pathEquipmentId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(pathEquipmentId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeEnumSizeNoTag(avatarId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += (1 * unlockedSpecialPointIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedSpecialPointIdList);
+        size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         size += (1 * multiPathSkillTree.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(multiPathSkillTree);
       }
-      if ((bitField0_ & 0x00000020) != 0) {
-        size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList);
-      }
-      if ((bitField0_ & 0x00000040) != 0) {
-        size += (1 * specialSkilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(specialSkilltreeList);
-      }
       return size;
     }
 
@@ -651,25 +469,25 @@ public final class MultiPathAvatarInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 72: {
-            // pathEquipmentId
-            pathEquipmentId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 96) {
-              break;
-            }
-          }
-          case 96: {
+          case 56: {
             // rank
             rank = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 80) {
               break;
             }
           }
-          case 88: {
+          case 80: {
+            // pathEquipmentId
+            pathEquipmentId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 16) {
+              break;
+            }
+          }
+          case 16: {
             // avatarId
             final int value = input.readInt32();
             if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) {
@@ -677,39 +495,22 @@ public final class MultiPathAvatarInfoOuterClass {
               bitField0_ |= 0x00000004;
             }
             tag = input.readTag();
-            if (tag != 122) {
+            if (tag != 26) {
               break;
             }
           }
-          case 122: {
-            // unlockedSpecialPointIdList [packed=true]
-            input.readPackedUInt32(unlockedSpecialPointIdList, tag);
+          case 26: {
+            // equipRelicList
+            tag = input.readRepeatedMessage(equipRelicList, tag);
             bitField0_ |= 0x00000008;
-            tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 34) {
               break;
             }
           }
-          case 42: {
+          case 34: {
             // multiPathSkillTree
             tag = input.readRepeatedMessage(multiPathSkillTree, tag);
             bitField0_ |= 0x00000010;
-            if (tag != 106) {
-              break;
-            }
-          }
-          case 106: {
-            // equipRelicList
-            tag = input.readRepeatedMessage(equipRelicList, tag);
-            bitField0_ |= 0x00000020;
-            if (tag != 114) {
-              break;
-            }
-          }
-          case 114: {
-            // specialSkilltreeList
-            tag = input.readRepeatedMessage(specialSkilltreeList, tag);
-            bitField0_ |= 0x00000040;
             if (tag != 0) {
               break;
             }
@@ -724,12 +525,6 @@ public final class MultiPathAvatarInfoOuterClass {
             tag = input.readTag();
             break;
           }
-          case 120: {
-            // unlockedSpecialPointIdList [packed=false]
-            tag = input.readRepeatedUInt32(unlockedSpecialPointIdList, tag);
-            bitField0_ |= 0x00000008;
-            break;
-          }
         }
       }
     }
@@ -738,26 +533,20 @@ public final class MultiPathAvatarInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.pathEquipmentId, pathEquipmentId);
+        output.writeUInt32(FieldNames.rank, rank);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.rank, rank);
+        output.writeUInt32(FieldNames.pathEquipmentId, pathEquipmentId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeEnum(FieldNames.avatarId, avatarId, MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter());
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRepeatedUInt32(FieldNames.unlockedSpecialPointIdList, unlockedSpecialPointIdList);
+        output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         output.writeRepeatedMessage(FieldNames.multiPathSkillTree, multiPathSkillTree);
       }
-      if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList);
-      }
-      if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRepeatedMessage(FieldNames.specialSkilltreeList, specialSkilltreeList);
-      }
       output.endObject();
     }
 
@@ -768,11 +557,10 @@ public final class MultiPathAvatarInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1371565540:
-          case -1584422074: {
-            if (input.isAtField(FieldNames.pathEquipmentId)) {
+          case 3492908: {
+            if (input.isAtField(FieldNames.rank)) {
               if (!input.trySkipNullValue()) {
-                pathEquipmentId = input.readUInt32();
+                rank = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -780,10 +568,11 @@ public final class MultiPathAvatarInfoOuterClass {
             }
             break;
           }
-          case 3492908: {
-            if (input.isAtField(FieldNames.rank)) {
+          case 1371565540:
+          case -1584422074: {
+            if (input.isAtField(FieldNames.pathEquipmentId)) {
               if (!input.trySkipNullValue()) {
-                rank = input.readUInt32();
+                pathEquipmentId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -808,11 +597,11 @@ public final class MultiPathAvatarInfoOuterClass {
             }
             break;
           }
-          case -1953824813:
-          case 321612849: {
-            if (input.isAtField(FieldNames.unlockedSpecialPointIdList)) {
+          case 1578968161:
+          case -795441831: {
+            if (input.isAtField(FieldNames.equipRelicList)) {
               if (!input.trySkipNullValue()) {
-                input.readRepeatedUInt32(unlockedSpecialPointIdList);
+                input.readRepeatedMessage(equipRelicList);
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -832,30 +621,6 @@ public final class MultiPathAvatarInfoOuterClass {
             }
             break;
           }
-          case 1578968161:
-          case -795441831: {
-            if (input.isAtField(FieldNames.equipRelicList)) {
-              if (!input.trySkipNullValue()) {
-                input.readRepeatedMessage(equipRelicList);
-                bitField0_ |= 0x00000020;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case 772023924:
-          case -1081979468: {
-            if (input.isAtField(FieldNames.specialSkilltreeList)) {
-              if (!input.trySkipNullValue()) {
-                input.readRepeatedMessage(specialSkilltreeList);
-                bitField0_ |= 0x00000040;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           default: {
             input.skipUnknownField();
             break;
@@ -909,19 +674,15 @@ public final class MultiPathAvatarInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName pathEquipmentId = FieldName.forField("pathEquipmentId", "path_equipment_id");
-
       static final FieldName rank = FieldName.forField("rank");
 
+      static final FieldName pathEquipmentId = FieldName.forField("pathEquipmentId", "path_equipment_id");
+
       static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
 
-      static final FieldName unlockedSpecialPointIdList = FieldName.forField("unlockedSpecialPointIdList", "unlocked_special_point_id_list");
-
-      static final FieldName multiPathSkillTree = FieldName.forField("multiPathSkillTree", "multi_path_skill_tree");
-
       static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list");
 
-      static final FieldName specialSkilltreeList = FieldName.forField("specialSkilltreeList", "special_skilltree_list");
+      static final FieldName multiPathSkillTree = FieldName.forField("multiPathSkillTree", "multi_path_skill_tree");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/MultiPathAvatarTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/MultiPathAvatarTypeOuterClass.java
index 0fec6b9..8a7274e 100644
--- a/src/generated/main/emu/lunarcore/proto/MultiPathAvatarTypeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MultiPathAvatarTypeOuterClass.java
@@ -127,7 +127,7 @@ public final class MultiPathAvatarTypeOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return MultiPathAvatarTypeConverter.INSTANCE;
     }
 
@@ -149,7 +149,7 @@ public final class MultiPathAvatarTypeOuterClass {
       return value == null ? other : value;
     }
 
-    enum MultiPathAvatarTypeConverter implements EnumConverter {
+    enum MultiPathAvatarTypeConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       @Override
diff --git a/src/generated/main/emu/lunarcore/proto/NpcDialogueEventParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcDialogueEventParamOuterClass.java
index 1f7da57..76febc8 100644
--- a/src/generated/main/emu/lunarcore/proto/NpcDialogueEventParamOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/NpcDialogueEventParamOuterClass.java
@@ -18,16 +18,16 @@ public final class NpcDialogueEventParamOuterClass {
   public static final class NpcDialogueEventParam extends ProtoMessage implements Cloneable {
     private static final long serialVersionUID = 0L;
 
+    /**
+     * optional uint32 arg_id = 3;
+     */
+    private int argId;
+
     /**
      * optional uint32 rogue_dialogue_event_id = 12;
      */
     private int rogueDialogueEventId;
 
-    /**
-     * optional uint32 arg_id = 13;
-     */
-    private int argId;
-
     private NpcDialogueEventParam() {
     }
 
@@ -38,12 +38,49 @@ public final class NpcDialogueEventParamOuterClass {
       return new NpcDialogueEventParam();
     }
 
+    /**
+     * optional uint32 arg_id = 3;
+     * @return whether the argId field is set
+     */
+    public boolean hasArgId() {
+      return (bitField0_ & 0x00000001) != 0;
+    }
+
+    /**
+     * optional uint32 arg_id = 3;
+     * @return this
+     */
+    public NpcDialogueEventParam clearArgId() {
+      bitField0_ &= ~0x00000001;
+      argId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 arg_id = 3;
+     * @return the argId
+     */
+    public int getArgId() {
+      return argId;
+    }
+
+    /**
+     * optional uint32 arg_id = 3;
+     * @param value the argId to set
+     * @return this
+     */
+    public NpcDialogueEventParam setArgId(final int value) {
+      bitField0_ |= 0x00000001;
+      argId = value;
+      return this;
+    }
+
     /**
      * optional uint32 rogue_dialogue_event_id = 12;
      * @return whether the rogueDialogueEventId field is set
      */
     public boolean hasRogueDialogueEventId() {
-      return (bitField0_ & 0x00000001) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
@@ -51,7 +88,7 @@ public final class NpcDialogueEventParamOuterClass {
      * @return this
      */
     public NpcDialogueEventParam clearRogueDialogueEventId() {
-      bitField0_ &= ~0x00000001;
+      bitField0_ &= ~0x00000002;
       rogueDialogueEventId = 0;
       return this;
     }
@@ -70,45 +107,8 @@ public final class NpcDialogueEventParamOuterClass {
      * @return this
      */
     public NpcDialogueEventParam setRogueDialogueEventId(final int value) {
-      bitField0_ |= 0x00000001;
-      rogueDialogueEventId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 arg_id = 13;
-     * @return whether the argId field is set
-     */
-    public boolean hasArgId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 arg_id = 13;
-     * @return this
-     */
-    public NpcDialogueEventParam clearArgId() {
-      bitField0_ &= ~0x00000002;
-      argId = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 arg_id = 13;
-     * @return the argId
-     */
-    public int getArgId() {
-      return argId;
-    }
-
-    /**
-     * optional uint32 arg_id = 13;
-     * @param value the argId to set
-     * @return this
-     */
-    public NpcDialogueEventParam setArgId(final int value) {
       bitField0_ |= 0x00000002;
-      argId = value;
+      rogueDialogueEventId = value;
       return this;
     }
 
@@ -117,8 +117,8 @@ public final class NpcDialogueEventParamOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        rogueDialogueEventId = other.rogueDialogueEventId;
         argId = other.argId;
+        rogueDialogueEventId = other.rogueDialogueEventId;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class NpcDialogueEventParamOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasRogueDialogueEventId()) {
-        setRogueDialogueEventId(other.rogueDialogueEventId);
-      }
       if (other.hasArgId()) {
         setArgId(other.argId);
       }
+      if (other.hasRogueDialogueEventId()) {
+        setRogueDialogueEventId(other.rogueDialogueEventId);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class NpcDialogueEventParamOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      rogueDialogueEventId = 0;
       argId = 0;
+      rogueDialogueEventId = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class NpcDialogueEventParamOuterClass {
       }
       NpcDialogueEventParam other = (NpcDialogueEventParam) o;
       return bitField0_ == other.bitField0_
-        && (!hasRogueDialogueEventId() || rogueDialogueEventId == other.rogueDialogueEventId)
-        && (!hasArgId() || argId == other.argId);
+        && (!hasArgId() || argId == other.argId)
+        && (!hasRogueDialogueEventId() || rogueDialogueEventId == other.rogueDialogueEventId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 96);
-        output.writeUInt32NoTag(rogueDialogueEventId);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(argId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 104);
-        output.writeUInt32NoTag(argId);
+        output.writeRawByte((byte) 96);
+        output.writeUInt32NoTag(rogueDialogueEventId);
       }
     }
 
@@ -190,10 +190,10 @@ public final class NpcDialogueEventParamOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueDialogueEventId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(argId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(argId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueDialogueEventId);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class NpcDialogueEventParamOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 96: {
-            // rogueDialogueEventId
-            rogueDialogueEventId = input.readUInt32();
+          case 24: {
+            // argId
+            argId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 96) {
               break;
             }
           }
-          case 104: {
-            // argId
-            argId = input.readUInt32();
+          case 96: {
+            // rogueDialogueEventId
+            rogueDialogueEventId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class NpcDialogueEventParamOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.rogueDialogueEventId, rogueDialogueEventId);
+        output.writeUInt32(FieldNames.argId, argId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.argId, argId);
+        output.writeUInt32(FieldNames.rogueDialogueEventId, rogueDialogueEventId);
       }
       output.endObject();
     }
@@ -256,11 +256,11 @@ public final class NpcDialogueEventParamOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 262816547:
-          case -963375038: {
-            if (input.isAtField(FieldNames.rogueDialogueEventId)) {
+          case 93079057:
+          case -1409495132: {
+            if (input.isAtField(FieldNames.argId)) {
               if (!input.trySkipNullValue()) {
-                rogueDialogueEventId = input.readUInt32();
+                argId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -268,11 +268,11 @@ public final class NpcDialogueEventParamOuterClass {
             }
             break;
           }
-          case 93079057:
-          case -1409495132: {
-            if (input.isAtField(FieldNames.argId)) {
+          case 262816547:
+          case -963375038: {
+            if (input.isAtField(FieldNames.rogueDialogueEventId)) {
               if (!input.trySkipNullValue()) {
-                argId = input.readUInt32();
+                rogueDialogueEventId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -333,9 +333,9 @@ public final class NpcDialogueEventParamOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName rogueDialogueEventId = FieldName.forField("rogueDialogueEventId", "rogue_dialogue_event_id");
-
       static final FieldName argId = FieldName.forField("argId", "arg_id");
+
+      static final FieldName rogueDialogueEventId = FieldName.forField("rogueDialogueEventId", "rogue_dialogue_event_id");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java
index 9ec26b7..afb3fe1 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 = 7;
+     * optional .NpcRogueInfo rogue_info = 6;
      */
     private final NpcRogueInfoOuterClass.NpcRogueInfo rogueInfo = NpcRogueInfoOuterClass.NpcRogueInfo.newInstance();
 
@@ -34,7 +34,7 @@ public final class NpcExtraInfoOuterClass {
     }
 
     /**
-     * optional .NpcRogueInfo rogue_info = 7;
+     * optional .NpcRogueInfo rogue_info = 6;
      * @return whether the rogueInfo field is set
      */
     public boolean hasRogueInfo() {
@@ -42,7 +42,7 @@ public final class NpcExtraInfoOuterClass {
     }
 
     /**
-     * optional .NpcRogueInfo rogue_info = 7;
+     * optional .NpcRogueInfo rogue_info = 6;
      * @return this
      */
     public NpcExtraInfo clearRogueInfo() {
@@ -52,7 +52,7 @@ public final class NpcExtraInfoOuterClass {
     }
 
     /**
-     * optional .NpcRogueInfo rogue_info = 7;
+     * optional .NpcRogueInfo rogue_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.
@@ -66,7 +66,7 @@ public final class NpcExtraInfoOuterClass {
     }
 
     /**
-     * optional .NpcRogueInfo rogue_info = 7;
+     * optional .NpcRogueInfo rogue_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
@@ -80,7 +80,7 @@ public final class NpcExtraInfoOuterClass {
     }
 
     /**
-     * optional .NpcRogueInfo rogue_info = 7;
+     * optional .NpcRogueInfo rogue_info = 6;
      * @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) 58);
+        output.writeRawByte((byte) 50);
         output.writeMessageNoTag(rogueInfo);
       }
     }
@@ -171,7 +171,7 @@ public final class NpcExtraInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 58: {
+          case 50: {
             // 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 89a80ea..7268c0a 100644
--- a/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java
@@ -14,60 +14,68 @@ import us.hebi.quickbuf.RepeatedMessage;
 
 public final class NpcRogueInfoOuterClass {
   /**
+   * 
+   *  HIACMGHPPMI
+   * 

+   *
    * Protobuf type {@code NpcRogueInfo}
    */
   public static final class NpcRogueInfo extends ProtoMessage implements Cloneable {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 OENLKDCLEOA = 2;
-     */
-    private int oENLKDCLEOA;
-
-    /**
-     * optional uint32 event_unique_id = 4;
-     */
-    private int eventUniqueId;
-
-    /**
-     * optional uint32 event_id = 11;
-     */
-    private int eventId;
-
-    /**
-     * optional uint32 dialogue_id = 12;
+     * optional uint32 dialogue_id = 3;
      */
     private int dialogueId;
 
     /**
-     * optional bool JFCBEHNMGNO = 1;
+     * optional uint32 KIAKKDIECME = 5;
      */
-    private boolean jFCBEHNMGNO;
+    private int kIAKKDIECME;
 
     /**
-     * optional bool JOFMIKFBGHP = 9;
+     * optional uint32 event_id = 9;
      */
-    private boolean jOFMIKFBGHP;
+    private int eventId;
 
     /**
-     * optional bool finish_dialogue = 15;
+     * optional uint32 event_unique_id = 10;
+     */
+    private int eventUniqueId;
+
+    /**
+     * optional bool PHDDANOOOJI = 2;
+     */
+    private boolean pHDDANOOOJI;
+
+    /**
+     * optional bool IDOFFGNNGEM = 11;
+     */
+    private boolean iDOFFGNNGEM;
+
+    /**
+     * optional bool finish_dialogue = 12;
      */
     private boolean finishDialogue;
 
     /**
-     * repeated .NpcDialogueEventParam dialogue_event_param_list = 5;
+     * repeated .NpcRogueInfo.LPFLCICNIOAEntry LPFLCICNIOA = 14;
      */
-    private final RepeatedMessage dialogueEventParamList = RepeatedMessage.newEmptyInstance(NpcDialogueEventParamOuterClass.NpcDialogueEventParam.getFactory());
+    private final RepeatedMessage lPFLCICNIOA = RepeatedMessage.newEmptyInstance(LPFLCICNIOAEntry.getFactory());
 
     /**
-     * repeated .NpcRogueInfo.FKDHDCGOIMFEntry FKDHDCGOIMF = 8;
+     * repeated .NpcDialogueEventParam dialogue_event_param_list = 15;
      */
-    private final RepeatedMessage fKDHDCGOIMF = RepeatedMessage.newEmptyInstance(FKDHDCGOIMFEntry.getFactory());
+    private final RepeatedMessage dialogueEventParamList = RepeatedMessage.newEmptyInstance(NpcDialogueEventParamOuterClass.NpcDialogueEventParam.getFactory());
 
     private NpcRogueInfo() {
     }
 
     /**
+     * 
+     *  HIACMGHPPMI
+     * 

+     *
      * @return a new empty instance of {@code NpcRogueInfo}
      */
     public static NpcRogueInfo newInstance() {
@@ -75,81 +83,81 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 OENLKDCLEOA = 2;
-     * @return whether the oENLKDCLEOA field is set
+     * optional uint32 dialogue_id = 3;
+     * @return whether the dialogueId field is set
      */
-    public boolean hasOENLKDCLEOA() {
+    public boolean hasDialogueId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 OENLKDCLEOA = 2;
+     * optional uint32 dialogue_id = 3;
      * @return this
      */
-    public NpcRogueInfo clearOENLKDCLEOA() {
+    public NpcRogueInfo clearDialogueId() {
       bitField0_ &= ~0x00000001;
-      oENLKDCLEOA = 0;
+      dialogueId = 0;
       return this;
     }
 
     /**
-     * optional uint32 OENLKDCLEOA = 2;
-     * @return the oENLKDCLEOA
+     * optional uint32 dialogue_id = 3;
+     * @return the dialogueId
      */
-    public int getOENLKDCLEOA() {
-      return oENLKDCLEOA;
+    public int getDialogueId() {
+      return dialogueId;
     }
 
     /**
-     * optional uint32 OENLKDCLEOA = 2;
-     * @param value the oENLKDCLEOA to set
+     * optional uint32 dialogue_id = 3;
+     * @param value the dialogueId to set
      * @return this
      */
-    public NpcRogueInfo setOENLKDCLEOA(final int value) {
+    public NpcRogueInfo setDialogueId(final int value) {
       bitField0_ |= 0x00000001;
-      oENLKDCLEOA = value;
+      dialogueId = value;
       return this;
     }
 
     /**
-     * optional uint32 event_unique_id = 4;
-     * @return whether the eventUniqueId field is set
+     * optional uint32 KIAKKDIECME = 5;
+     * @return whether the kIAKKDIECME field is set
      */
-    public boolean hasEventUniqueId() {
+    public boolean hasKIAKKDIECME() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * optional uint32 event_unique_id = 4;
+     * optional uint32 KIAKKDIECME = 5;
      * @return this
      */
-    public NpcRogueInfo clearEventUniqueId() {
+    public NpcRogueInfo clearKIAKKDIECME() {
       bitField0_ &= ~0x00000002;
-      eventUniqueId = 0;
+      kIAKKDIECME = 0;
       return this;
     }
 
     /**
-     * optional uint32 event_unique_id = 4;
-     * @return the eventUniqueId
+     * optional uint32 KIAKKDIECME = 5;
+     * @return the kIAKKDIECME
      */
-    public int getEventUniqueId() {
-      return eventUniqueId;
+    public int getKIAKKDIECME() {
+      return kIAKKDIECME;
     }
 
     /**
-     * optional uint32 event_unique_id = 4;
-     * @param value the eventUniqueId to set
+     * optional uint32 KIAKKDIECME = 5;
+     * @param value the kIAKKDIECME to set
      * @return this
      */
-    public NpcRogueInfo setEventUniqueId(final int value) {
+    public NpcRogueInfo setKIAKKDIECME(final int value) {
       bitField0_ |= 0x00000002;
-      eventUniqueId = value;
+      kIAKKDIECME = value;
       return this;
     }
 
     /**
-     * optional uint32 event_id = 11;
+     * optional uint32 event_id = 9;
      * @return whether the eventId field is set
      */
     public boolean hasEventId() {
@@ -157,7 +165,7 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 event_id = 11;
+     * optional uint32 event_id = 9;
      * @return this
      */
     public NpcRogueInfo clearEventId() {
@@ -167,7 +175,7 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 event_id = 11;
+     * optional uint32 event_id = 9;
      * @return the eventId
      */
     public int getEventId() {
@@ -175,7 +183,7 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 event_id = 11;
+     * optional uint32 event_id = 9;
      * @param value the eventId to set
      * @return this
      */
@@ -186,118 +194,118 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 dialogue_id = 12;
-     * @return whether the dialogueId field is set
+     * optional uint32 event_unique_id = 10;
+     * @return whether the eventUniqueId field is set
      */
-    public boolean hasDialogueId() {
+    public boolean hasEventUniqueId() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * optional uint32 dialogue_id = 12;
+     * optional uint32 event_unique_id = 10;
      * @return this
      */
-    public NpcRogueInfo clearDialogueId() {
+    public NpcRogueInfo clearEventUniqueId() {
       bitField0_ &= ~0x00000008;
-      dialogueId = 0;
+      eventUniqueId = 0;
       return this;
     }
 
     /**
-     * optional uint32 dialogue_id = 12;
-     * @return the dialogueId
+     * optional uint32 event_unique_id = 10;
+     * @return the eventUniqueId
      */
-    public int getDialogueId() {
-      return dialogueId;
+    public int getEventUniqueId() {
+      return eventUniqueId;
     }
 
     /**
-     * optional uint32 dialogue_id = 12;
-     * @param value the dialogueId to set
+     * optional uint32 event_unique_id = 10;
+     * @param value the eventUniqueId to set
      * @return this
      */
-    public NpcRogueInfo setDialogueId(final int value) {
+    public NpcRogueInfo setEventUniqueId(final int value) {
       bitField0_ |= 0x00000008;
-      dialogueId = value;
+      eventUniqueId = value;
       return this;
     }
 
     /**
-     * optional bool JFCBEHNMGNO = 1;
-     * @return whether the jFCBEHNMGNO field is set
+     * optional bool PHDDANOOOJI = 2;
+     * @return whether the pHDDANOOOJI field is set
      */
-    public boolean hasJFCBEHNMGNO() {
+    public boolean hasPHDDANOOOJI() {
       return (bitField0_ & 0x00000010) != 0;
     }
 
     /**
-     * optional bool JFCBEHNMGNO = 1;
+     * optional bool PHDDANOOOJI = 2;
      * @return this
      */
-    public NpcRogueInfo clearJFCBEHNMGNO() {
+    public NpcRogueInfo clearPHDDANOOOJI() {
       bitField0_ &= ~0x00000010;
-      jFCBEHNMGNO = false;
+      pHDDANOOOJI = false;
       return this;
     }
 
     /**
-     * optional bool JFCBEHNMGNO = 1;
-     * @return the jFCBEHNMGNO
+     * optional bool PHDDANOOOJI = 2;
+     * @return the pHDDANOOOJI
      */
-    public boolean getJFCBEHNMGNO() {
-      return jFCBEHNMGNO;
+    public boolean getPHDDANOOOJI() {
+      return pHDDANOOOJI;
     }
 
     /**
-     * optional bool JFCBEHNMGNO = 1;
-     * @param value the jFCBEHNMGNO to set
+     * optional bool PHDDANOOOJI = 2;
+     * @param value the pHDDANOOOJI to set
      * @return this
      */
-    public NpcRogueInfo setJFCBEHNMGNO(final boolean value) {
+    public NpcRogueInfo setPHDDANOOOJI(final boolean value) {
       bitField0_ |= 0x00000010;
-      jFCBEHNMGNO = value;
+      pHDDANOOOJI = value;
       return this;
     }
 
     /**
-     * optional bool JOFMIKFBGHP = 9;
-     * @return whether the jOFMIKFBGHP field is set
+     * optional bool IDOFFGNNGEM = 11;
+     * @return whether the iDOFFGNNGEM field is set
      */
-    public boolean hasJOFMIKFBGHP() {
+    public boolean hasIDOFFGNNGEM() {
       return (bitField0_ & 0x00000020) != 0;
     }
 
     /**
-     * optional bool JOFMIKFBGHP = 9;
+     * optional bool IDOFFGNNGEM = 11;
      * @return this
      */
-    public NpcRogueInfo clearJOFMIKFBGHP() {
+    public NpcRogueInfo clearIDOFFGNNGEM() {
       bitField0_ &= ~0x00000020;
-      jOFMIKFBGHP = false;
+      iDOFFGNNGEM = false;
       return this;
     }
 
     /**
-     * optional bool JOFMIKFBGHP = 9;
-     * @return the jOFMIKFBGHP
+     * optional bool IDOFFGNNGEM = 11;
+     * @return the iDOFFGNNGEM
      */
-    public boolean getJOFMIKFBGHP() {
-      return jOFMIKFBGHP;
+    public boolean getIDOFFGNNGEM() {
+      return iDOFFGNNGEM;
     }
 
     /**
-     * optional bool JOFMIKFBGHP = 9;
-     * @param value the jOFMIKFBGHP to set
+     * optional bool IDOFFGNNGEM = 11;
+     * @param value the iDOFFGNNGEM to set
      * @return this
      */
-    public NpcRogueInfo setJOFMIKFBGHP(final boolean value) {
+    public NpcRogueInfo setIDOFFGNNGEM(final boolean value) {
       bitField0_ |= 0x00000020;
-      jOFMIKFBGHP = value;
+      iDOFFGNNGEM = value;
       return this;
     }
 
     /**
-     * optional bool finish_dialogue = 15;
+     * optional bool finish_dialogue = 12;
      * @return whether the finishDialogue field is set
      */
     public boolean hasFinishDialogue() {
@@ -305,7 +313,7 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * optional bool finish_dialogue = 15;
+     * optional bool finish_dialogue = 12;
      * @return this
      */
     public NpcRogueInfo clearFinishDialogue() {
@@ -315,7 +323,7 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * optional bool finish_dialogue = 15;
+     * optional bool finish_dialogue = 12;
      * @return the finishDialogue
      */
     public boolean getFinishDialogue() {
@@ -323,7 +331,7 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * optional bool finish_dialogue = 15;
+     * optional bool finish_dialogue = 12;
      * @param value the finishDialogue to set
      * @return this
      */
@@ -334,25 +342,93 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * repeated .NpcDialogueEventParam dialogue_event_param_list = 5;
-     * @return whether the dialogueEventParamList field is set
+     * repeated .NpcRogueInfo.LPFLCICNIOAEntry LPFLCICNIOA = 14;
+     * @return whether the lPFLCICNIOA field is set
      */
-    public boolean hasDialogueEventParamList() {
+    public boolean hasLPFLCICNIOA() {
       return (bitField0_ & 0x00000080) != 0;
     }
 
     /**
-     * repeated .NpcDialogueEventParam dialogue_event_param_list = 5;
+     * repeated .NpcRogueInfo.LPFLCICNIOAEntry LPFLCICNIOA = 14;
+     * @return this
+     */
+    public NpcRogueInfo clearLPFLCICNIOA() {
+      bitField0_ &= ~0x00000080;
+      lPFLCICNIOA.clear();
+      return this;
+    }
+
+    /**
+     * repeated .NpcRogueInfo.LPFLCICNIOAEntry LPFLCICNIOA = 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 #getMutableLPFLCICNIOA()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public RepeatedMessage getLPFLCICNIOA() {
+      return lPFLCICNIOA;
+    }
+
+    /**
+     * repeated .NpcRogueInfo.LPFLCICNIOAEntry LPFLCICNIOA = 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 getMutableLPFLCICNIOA() {
+      bitField0_ |= 0x00000080;
+      return lPFLCICNIOA;
+    }
+
+    /**
+     * repeated .NpcRogueInfo.LPFLCICNIOAEntry LPFLCICNIOA = 14;
+     * @param value the lPFLCICNIOA to add
+     * @return this
+     */
+    public NpcRogueInfo addLPFLCICNIOA(final LPFLCICNIOAEntry value) {
+      bitField0_ |= 0x00000080;
+      lPFLCICNIOA.add(value);
+      return this;
+    }
+
+    /**
+     * repeated .NpcRogueInfo.LPFLCICNIOAEntry LPFLCICNIOA = 14;
+     * @param values the lPFLCICNIOA to add
+     * @return this
+     */
+    public NpcRogueInfo addAllLPFLCICNIOA(final LPFLCICNIOAEntry... values) {
+      bitField0_ |= 0x00000080;
+      lPFLCICNIOA.addAll(values);
+      return this;
+    }
+
+    /**
+     * repeated .NpcDialogueEventParam dialogue_event_param_list = 15;
+     * @return whether the dialogueEventParamList field is set
+     */
+    public boolean hasDialogueEventParamList() {
+      return (bitField0_ & 0x00000100) != 0;
+    }
+
+    /**
+     * repeated .NpcDialogueEventParam dialogue_event_param_list = 15;
      * @return this
      */
     public NpcRogueInfo clearDialogueEventParamList() {
-      bitField0_ &= ~0x00000080;
+      bitField0_ &= ~0x00000100;
       dialogueEventParamList.clear();
       return this;
     }
 
     /**
-     * repeated .NpcDialogueEventParam dialogue_event_param_list = 5;
+     * repeated .NpcDialogueEventParam dialogue_event_param_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.
@@ -367,7 +443,7 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * repeated .NpcDialogueEventParam dialogue_event_param_list = 5;
+     * repeated .NpcDialogueEventParam dialogue_event_param_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
@@ -377,116 +453,48 @@ public final class NpcRogueInfoOuterClass {
      */
     public RepeatedMessage getMutableDialogueEventParamList(
         ) {
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000100;
       return dialogueEventParamList;
     }
 
     /**
-     * repeated .NpcDialogueEventParam dialogue_event_param_list = 5;
+     * repeated .NpcDialogueEventParam dialogue_event_param_list = 15;
      * @param value the dialogueEventParamList to add
      * @return this
      */
     public NpcRogueInfo addDialogueEventParamList(
         final NpcDialogueEventParamOuterClass.NpcDialogueEventParam value) {
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000100;
       dialogueEventParamList.add(value);
       return this;
     }
 
     /**
-     * repeated .NpcDialogueEventParam dialogue_event_param_list = 5;
+     * repeated .NpcDialogueEventParam dialogue_event_param_list = 15;
      * @param values the dialogueEventParamList to add
      * @return this
      */
     public NpcRogueInfo addAllDialogueEventParamList(
         final NpcDialogueEventParamOuterClass.NpcDialogueEventParam... values) {
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000100;
       dialogueEventParamList.addAll(values);
       return this;
     }
 
-    /**
-     * repeated .NpcRogueInfo.FKDHDCGOIMFEntry FKDHDCGOIMF = 8;
-     * @return whether the fKDHDCGOIMF field is set
-     */
-    public boolean hasFKDHDCGOIMF() {
-      return (bitField0_ & 0x00000100) != 0;
-    }
-
-    /**
-     * repeated .NpcRogueInfo.FKDHDCGOIMFEntry FKDHDCGOIMF = 8;
-     * @return this
-     */
-    public NpcRogueInfo clearFKDHDCGOIMF() {
-      bitField0_ &= ~0x00000100;
-      fKDHDCGOIMF.clear();
-      return this;
-    }
-
-    /**
-     * repeated .NpcRogueInfo.FKDHDCGOIMFEntry FKDHDCGOIMF = 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 #getMutableFKDHDCGOIMF()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RepeatedMessage getFKDHDCGOIMF() {
-      return fKDHDCGOIMF;
-    }
-
-    /**
-     * repeated .NpcRogueInfo.FKDHDCGOIMFEntry FKDHDCGOIMF = 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 getMutableFKDHDCGOIMF() {
-      bitField0_ |= 0x00000100;
-      return fKDHDCGOIMF;
-    }
-
-    /**
-     * repeated .NpcRogueInfo.FKDHDCGOIMFEntry FKDHDCGOIMF = 8;
-     * @param value the fKDHDCGOIMF to add
-     * @return this
-     */
-    public NpcRogueInfo addFKDHDCGOIMF(final FKDHDCGOIMFEntry value) {
-      bitField0_ |= 0x00000100;
-      fKDHDCGOIMF.add(value);
-      return this;
-    }
-
-    /**
-     * repeated .NpcRogueInfo.FKDHDCGOIMFEntry FKDHDCGOIMF = 8;
-     * @param values the fKDHDCGOIMF to add
-     * @return this
-     */
-    public NpcRogueInfo addAllFKDHDCGOIMF(final FKDHDCGOIMFEntry... values) {
-      bitField0_ |= 0x00000100;
-      fKDHDCGOIMF.addAll(values);
-      return this;
-    }
-
     @Override
     public NpcRogueInfo copyFrom(final NpcRogueInfo other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        oENLKDCLEOA = other.oENLKDCLEOA;
-        eventUniqueId = other.eventUniqueId;
-        eventId = other.eventId;
         dialogueId = other.dialogueId;
-        jFCBEHNMGNO = other.jFCBEHNMGNO;
-        jOFMIKFBGHP = other.jOFMIKFBGHP;
+        kIAKKDIECME = other.kIAKKDIECME;
+        eventId = other.eventId;
+        eventUniqueId = other.eventUniqueId;
+        pHDDANOOOJI = other.pHDDANOOOJI;
+        iDOFFGNNGEM = other.iDOFFGNNGEM;
         finishDialogue = other.finishDialogue;
+        lPFLCICNIOA.copyFrom(other.lPFLCICNIOA);
         dialogueEventParamList.copyFrom(other.dialogueEventParamList);
-        fKDHDCGOIMF.copyFrom(other.fKDHDCGOIMF);
       }
       return this;
     }
@@ -497,33 +505,33 @@ public final class NpcRogueInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasOENLKDCLEOA()) {
-        setOENLKDCLEOA(other.oENLKDCLEOA);
+      if (other.hasDialogueId()) {
+        setDialogueId(other.dialogueId);
       }
-      if (other.hasEventUniqueId()) {
-        setEventUniqueId(other.eventUniqueId);
+      if (other.hasKIAKKDIECME()) {
+        setKIAKKDIECME(other.kIAKKDIECME);
       }
       if (other.hasEventId()) {
         setEventId(other.eventId);
       }
-      if (other.hasDialogueId()) {
-        setDialogueId(other.dialogueId);
+      if (other.hasEventUniqueId()) {
+        setEventUniqueId(other.eventUniqueId);
       }
-      if (other.hasJFCBEHNMGNO()) {
-        setJFCBEHNMGNO(other.jFCBEHNMGNO);
+      if (other.hasPHDDANOOOJI()) {
+        setPHDDANOOOJI(other.pHDDANOOOJI);
       }
-      if (other.hasJOFMIKFBGHP()) {
-        setJOFMIKFBGHP(other.jOFMIKFBGHP);
+      if (other.hasIDOFFGNNGEM()) {
+        setIDOFFGNNGEM(other.iDOFFGNNGEM);
       }
       if (other.hasFinishDialogue()) {
         setFinishDialogue(other.finishDialogue);
       }
+      if (other.hasLPFLCICNIOA()) {
+        getMutableLPFLCICNIOA().addAll(other.lPFLCICNIOA);
+      }
       if (other.hasDialogueEventParamList()) {
         getMutableDialogueEventParamList().addAll(other.dialogueEventParamList);
       }
-      if (other.hasFKDHDCGOIMF()) {
-        getMutableFKDHDCGOIMF().addAll(other.fKDHDCGOIMF);
-      }
       return this;
     }
 
@@ -534,15 +542,15 @@ public final class NpcRogueInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      oENLKDCLEOA = 0;
-      eventUniqueId = 0;
-      eventId = 0;
       dialogueId = 0;
-      jFCBEHNMGNO = false;
-      jOFMIKFBGHP = false;
+      kIAKKDIECME = 0;
+      eventId = 0;
+      eventUniqueId = 0;
+      pHDDANOOOJI = false;
+      iDOFFGNNGEM = false;
       finishDialogue = false;
+      lPFLCICNIOA.clear();
       dialogueEventParamList.clear();
-      fKDHDCGOIMF.clear();
       return this;
     }
 
@@ -553,8 +561,8 @@ public final class NpcRogueInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
+      lPFLCICNIOA.clearQuick();
       dialogueEventParamList.clearQuick();
-      fKDHDCGOIMF.clearQuick();
       return this;
     }
 
@@ -568,57 +576,57 @@ public final class NpcRogueInfoOuterClass {
       }
       NpcRogueInfo other = (NpcRogueInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasOENLKDCLEOA() || oENLKDCLEOA == other.oENLKDCLEOA)
-        && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId)
-        && (!hasEventId() || eventId == other.eventId)
         && (!hasDialogueId() || dialogueId == other.dialogueId)
-        && (!hasJFCBEHNMGNO() || jFCBEHNMGNO == other.jFCBEHNMGNO)
-        && (!hasJOFMIKFBGHP() || jOFMIKFBGHP == other.jOFMIKFBGHP)
+        && (!hasKIAKKDIECME() || kIAKKDIECME == other.kIAKKDIECME)
+        && (!hasEventId() || eventId == other.eventId)
+        && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId)
+        && (!hasPHDDANOOOJI() || pHDDANOOOJI == other.pHDDANOOOJI)
+        && (!hasIDOFFGNNGEM() || iDOFFGNNGEM == other.iDOFFGNNGEM)
         && (!hasFinishDialogue() || finishDialogue == other.finishDialogue)
-        && (!hasDialogueEventParamList() || dialogueEventParamList.equals(other.dialogueEventParamList))
-        && (!hasFKDHDCGOIMF() || fKDHDCGOIMF.equals(other.fKDHDCGOIMF));
+        && (!hasLPFLCICNIOA() || lPFLCICNIOA.equals(other.lPFLCICNIOA))
+        && (!hasDialogueEventParamList() || dialogueEventParamList.equals(other.dialogueEventParamList));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
-        output.writeUInt32NoTag(oENLKDCLEOA);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(dialogueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(eventUniqueId);
+        output.writeRawByte((byte) 40);
+        output.writeUInt32NoTag(kIAKKDIECME);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(eventId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 96);
-        output.writeUInt32NoTag(dialogueId);
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(eventUniqueId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeBoolNoTag(jFCBEHNMGNO);
+        output.writeRawByte((byte) 16);
+        output.writeBoolNoTag(pHDDANOOOJI);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeBoolNoTag(jOFMIKFBGHP);
+        output.writeRawByte((byte) 88);
+        output.writeBoolNoTag(iDOFFGNNGEM);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 96);
         output.writeBoolNoTag(finishDialogue);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        for (int i = 0; i < dialogueEventParamList.length(); i++) {
-          output.writeRawByte((byte) 42);
-          output.writeMessageNoTag(dialogueEventParamList.get(i));
+        for (int i = 0; i < lPFLCICNIOA.length(); i++) {
+          output.writeRawByte((byte) 114);
+          output.writeMessageNoTag(lPFLCICNIOA.get(i));
         }
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        for (int i = 0; i < fKDHDCGOIMF.length(); i++) {
-          output.writeRawByte((byte) 66);
-          output.writeMessageNoTag(fKDHDCGOIMF.get(i));
+        for (int i = 0; i < dialogueEventParamList.length(); i++) {
+          output.writeRawByte((byte) 122);
+          output.writeMessageNoTag(dialogueEventParamList.get(i));
         }
       }
     }
@@ -627,16 +635,16 @@ public final class NpcRogueInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(oENLKDCLEOA);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(kIAKKDIECME);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         size += 2;
@@ -648,10 +656,10 @@ public final class NpcRogueInfoOuterClass {
         size += 2;
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        size += (1 * dialogueEventParamList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dialogueEventParamList);
+        size += (1 * lPFLCICNIOA.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lPFLCICNIOA);
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        size += (1 * fKDHDCGOIMF.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(fKDHDCGOIMF);
+        size += (1 * dialogueEventParamList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dialogueEventParamList);
       }
       return size;
     }
@@ -663,80 +671,80 @@ public final class NpcRogueInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
-            // oENLKDCLEOA
-            oENLKDCLEOA = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 32) {
-              break;
-            }
-          }
-          case 32: {
-            // eventUniqueId
-            eventUniqueId = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
-            // eventId
-            eventId = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 96) {
-              break;
-            }
-          }
-          case 96: {
+          case 24: {
             // dialogueId
             dialogueId = input.readUInt32();
-            bitField0_ |= 0x00000008;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 8) {
+            if (tag != 40) {
               break;
             }
           }
-          case 8: {
-            // jFCBEHNMGNO
-            jFCBEHNMGNO = input.readBool();
-            bitField0_ |= 0x00000010;
+          case 40: {
+            // kIAKKDIECME
+            kIAKKDIECME = input.readUInt32();
+            bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 72) {
               break;
             }
           }
           case 72: {
-            // jOFMIKFBGHP
-            jOFMIKFBGHP = input.readBool();
-            bitField0_ |= 0x00000020;
+            // eventId
+            eventId = input.readUInt32();
+            bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 80) {
               break;
             }
           }
-          case 120: {
+          case 80: {
+            // eventUniqueId
+            eventUniqueId = input.readUInt32();
+            bitField0_ |= 0x00000008;
+            tag = input.readTag();
+            if (tag != 16) {
+              break;
+            }
+          }
+          case 16: {
+            // pHDDANOOOJI
+            pHDDANOOOJI = input.readBool();
+            bitField0_ |= 0x00000010;
+            tag = input.readTag();
+            if (tag != 88) {
+              break;
+            }
+          }
+          case 88: {
+            // iDOFFGNNGEM
+            iDOFFGNNGEM = input.readBool();
+            bitField0_ |= 0x00000020;
+            tag = input.readTag();
+            if (tag != 96) {
+              break;
+            }
+          }
+          case 96: {
             // finishDialogue
             finishDialogue = input.readBool();
             bitField0_ |= 0x00000040;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 114) {
               break;
             }
           }
-          case 42: {
+          case 114: {
+            // lPFLCICNIOA
+            tag = input.readRepeatedMessage(lPFLCICNIOA, tag);
+            bitField0_ |= 0x00000080;
+            if (tag != 122) {
+              break;
+            }
+          }
+          case 122: {
             // dialogueEventParamList
             tag = input.readRepeatedMessage(dialogueEventParamList, tag);
-            bitField0_ |= 0x00000080;
-            if (tag != 66) {
-              break;
-            }
-          }
-          case 66: {
-            // fKDHDCGOIMF
-            tag = input.readRepeatedMessage(fKDHDCGOIMF, tag);
             bitField0_ |= 0x00000100;
             if (tag != 0) {
               break;
@@ -760,31 +768,31 @@ public final class NpcRogueInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.oENLKDCLEOA, oENLKDCLEOA);
+        output.writeUInt32(FieldNames.dialogueId, dialogueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId);
+        output.writeUInt32(FieldNames.kIAKKDIECME, kIAKKDIECME);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.eventId, eventId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.dialogueId, dialogueId);
+        output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeBool(FieldNames.jFCBEHNMGNO, jFCBEHNMGNO);
+        output.writeBool(FieldNames.pHDDANOOOJI, pHDDANOOOJI);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeBool(FieldNames.jOFMIKFBGHP, jOFMIKFBGHP);
+        output.writeBool(FieldNames.iDOFFGNNGEM, iDOFFGNNGEM);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         output.writeBool(FieldNames.finishDialogue, finishDialogue);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        output.writeRepeatedMessage(FieldNames.dialogueEventParamList, dialogueEventParamList);
+        output.writeRepeatedMessage(FieldNames.lPFLCICNIOA, lPFLCICNIOA);
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        output.writeRepeatedMessage(FieldNames.fKDHDCGOIMF, fKDHDCGOIMF);
+        output.writeRepeatedMessage(FieldNames.dialogueEventParamList, dialogueEventParamList);
       }
       output.endObject();
     }
@@ -796,10 +804,11 @@ public final class NpcRogueInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -983404159: {
-            if (input.isAtField(FieldNames.oENLKDCLEOA)) {
+          case -1384067821:
+          case 43591906: {
+            if (input.isAtField(FieldNames.dialogueId)) {
               if (!input.trySkipNullValue()) {
-                oENLKDCLEOA = input.readUInt32();
+                dialogueId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -807,11 +816,10 @@ public final class NpcRogueInfoOuterClass {
             }
             break;
           }
-          case 2091680134:
-          case -157385500: {
-            if (input.isAtField(FieldNames.eventUniqueId)) {
+          case 1407971774: {
+            if (input.isAtField(FieldNames.kIAKKDIECME)) {
               if (!input.trySkipNullValue()) {
-                eventUniqueId = input.readUInt32();
+                kIAKKDIECME = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -831,11 +839,11 @@ public final class NpcRogueInfoOuterClass {
             }
             break;
           }
-          case -1384067821:
-          case 43591906: {
-            if (input.isAtField(FieldNames.dialogueId)) {
+          case 2091680134:
+          case -157385500: {
+            if (input.isAtField(FieldNames.eventUniqueId)) {
               if (!input.trySkipNullValue()) {
-                dialogueId = input.readUInt32();
+                eventUniqueId = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -843,10 +851,10 @@ public final class NpcRogueInfoOuterClass {
             }
             break;
           }
-          case 763452523: {
-            if (input.isAtField(FieldNames.jFCBEHNMGNO)) {
+          case 774536297: {
+            if (input.isAtField(FieldNames.pHDDANOOOJI)) {
               if (!input.trySkipNullValue()) {
-                jFCBEHNMGNO = input.readBool();
+                pHDDANOOOJI = input.readBool();
                 bitField0_ |= 0x00000010;
               }
             } else {
@@ -854,10 +862,10 @@ public final class NpcRogueInfoOuterClass {
             }
             break;
           }
-          case -808301787: {
-            if (input.isAtField(FieldNames.jOFMIKFBGHP)) {
+          case 1979024604: {
+            if (input.isAtField(FieldNames.iDOFFGNNGEM)) {
               if (!input.trySkipNullValue()) {
-                jOFMIKFBGHP = input.readBool();
+                iDOFFGNNGEM = input.readBool();
                 bitField0_ |= 0x00000020;
               }
             } else {
@@ -877,11 +885,10 @@ public final class NpcRogueInfoOuterClass {
             }
             break;
           }
-          case -340413111:
-          case -612945060: {
-            if (input.isAtField(FieldNames.dialogueEventParamList)) {
+          case 1158682208: {
+            if (input.isAtField(FieldNames.lPFLCICNIOA)) {
               if (!input.trySkipNullValue()) {
-                input.readRepeatedMessage(dialogueEventParamList);
+                input.readRepeatedMessage(lPFLCICNIOA);
                 bitField0_ |= 0x00000080;
               }
             } else {
@@ -889,10 +896,11 @@ public final class NpcRogueInfoOuterClass {
             }
             break;
           }
-          case 1696143474: {
-            if (input.isAtField(FieldNames.fKDHDCGOIMF)) {
+          case -340413111:
+          case -612945060: {
+            if (input.isAtField(FieldNames.dialogueEventParamList)) {
               if (!input.trySkipNullValue()) {
-                input.readRepeatedMessage(fKDHDCGOIMF);
+                input.readRepeatedMessage(dialogueEventParamList);
                 bitField0_ |= 0x00000100;
               }
             } else {
@@ -940,9 +948,9 @@ public final class NpcRogueInfoOuterClass {
     }
 
     /**
-     * Protobuf type {@code FKDHDCGOIMFEntry}
+     * Protobuf type {@code LPFLCICNIOAEntry}
      */
-    public static final class FKDHDCGOIMFEntry extends ProtoMessage implements Cloneable {
+    public static final class LPFLCICNIOAEntry extends ProtoMessage implements Cloneable {
       private static final long serialVersionUID = 0L;
 
       /**
@@ -955,14 +963,14 @@ public final class NpcRogueInfoOuterClass {
        */
       private int value_;
 
-      private FKDHDCGOIMFEntry() {
+      private LPFLCICNIOAEntry() {
       }
 
       /**
-       * @return a new empty instance of {@code FKDHDCGOIMFEntry}
+       * @return a new empty instance of {@code LPFLCICNIOAEntry}
        */
-      public static FKDHDCGOIMFEntry newInstance() {
-        return new FKDHDCGOIMFEntry();
+      public static LPFLCICNIOAEntry newInstance() {
+        return new LPFLCICNIOAEntry();
       }
 
       /**
@@ -977,7 +985,7 @@ public final class NpcRogueInfoOuterClass {
        * optional uint32 key = 1;
        * @return this
        */
-      public FKDHDCGOIMFEntry clearKey() {
+      public LPFLCICNIOAEntry clearKey() {
         bitField0_ &= ~0x00000001;
         key = 0;
         return this;
@@ -996,7 +1004,7 @@ public final class NpcRogueInfoOuterClass {
        * @param value the key to set
        * @return this
        */
-      public FKDHDCGOIMFEntry setKey(final int value) {
+      public LPFLCICNIOAEntry setKey(final int value) {
         bitField0_ |= 0x00000001;
         key = value;
         return this;
@@ -1014,7 +1022,7 @@ public final class NpcRogueInfoOuterClass {
        * optional uint32 value = 2;
        * @return this
        */
-      public FKDHDCGOIMFEntry clearValue() {
+      public LPFLCICNIOAEntry clearValue() {
         bitField0_ &= ~0x00000002;
         value_ = 0;
         return this;
@@ -1033,14 +1041,14 @@ public final class NpcRogueInfoOuterClass {
        * @param value the value_ to set
        * @return this
        */
-      public FKDHDCGOIMFEntry setValue(final int value) {
+      public LPFLCICNIOAEntry setValue(final int value) {
         bitField0_ |= 0x00000002;
         value_ = value;
         return this;
       }
 
       @Override
-      public FKDHDCGOIMFEntry copyFrom(final FKDHDCGOIMFEntry other) {
+      public LPFLCICNIOAEntry copyFrom(final LPFLCICNIOAEntry other) {
         cachedSize = other.cachedSize;
         if ((bitField0_ | other.bitField0_) != 0) {
           bitField0_ = other.bitField0_;
@@ -1051,7 +1059,7 @@ public final class NpcRogueInfoOuterClass {
       }
 
       @Override
-      public FKDHDCGOIMFEntry mergeFrom(final FKDHDCGOIMFEntry other) {
+      public LPFLCICNIOAEntry mergeFrom(final LPFLCICNIOAEntry other) {
         if (other.isEmpty()) {
           return this;
         }
@@ -1066,7 +1074,7 @@ public final class NpcRogueInfoOuterClass {
       }
 
       @Override
-      public FKDHDCGOIMFEntry clear() {
+      public LPFLCICNIOAEntry clear() {
         if (isEmpty()) {
           return this;
         }
@@ -1078,7 +1086,7 @@ public final class NpcRogueInfoOuterClass {
       }
 
       @Override
-      public FKDHDCGOIMFEntry clearQuick() {
+      public LPFLCICNIOAEntry clearQuick() {
         if (isEmpty()) {
           return this;
         }
@@ -1092,10 +1100,10 @@ public final class NpcRogueInfoOuterClass {
         if (o == this) {
           return true;
         }
-        if (!(o instanceof FKDHDCGOIMFEntry)) {
+        if (!(o instanceof LPFLCICNIOAEntry)) {
           return false;
         }
-        FKDHDCGOIMFEntry other = (FKDHDCGOIMFEntry) o;
+        LPFLCICNIOAEntry other = (LPFLCICNIOAEntry) o;
         return bitField0_ == other.bitField0_
           && (!hasKey() || key == other.key)
           && (!hasValue() || value_ == other.value_);
@@ -1127,7 +1135,7 @@ public final class NpcRogueInfoOuterClass {
 
       @Override
       @SuppressWarnings("fallthrough")
-      public FKDHDCGOIMFEntry mergeFrom(final ProtoSource input) throws IOException {
+      public LPFLCICNIOAEntry mergeFrom(final ProtoSource input) throws IOException {
         // Enabled Fall-Through Optimization (QuickBuffers)
         int tag = input.readTag();
         while (true) {
@@ -1177,7 +1185,7 @@ public final class NpcRogueInfoOuterClass {
       }
 
       @Override
-      public FKDHDCGOIMFEntry mergeFrom(final JsonSource input) throws IOException {
+      public LPFLCICNIOAEntry mergeFrom(final JsonSource input) throws IOException {
         if (!input.beginObject()) {
           return this;
         }
@@ -1216,8 +1224,8 @@ public final class NpcRogueInfoOuterClass {
       }
 
       @Override
-      public FKDHDCGOIMFEntry clone() {
-        return new FKDHDCGOIMFEntry().copyFrom(this);
+      public LPFLCICNIOAEntry clone() {
+        return new LPFLCICNIOAEntry().copyFrom(this);
       }
 
       @Override
@@ -1225,32 +1233,32 @@ public final class NpcRogueInfoOuterClass {
         return ((bitField0_) == 0);
       }
 
-      public static FKDHDCGOIMFEntry parseFrom(final byte[] data) throws
+      public static LPFLCICNIOAEntry parseFrom(final byte[] data) throws
           InvalidProtocolBufferException {
-        return ProtoMessage.mergeFrom(new FKDHDCGOIMFEntry(), data).checkInitialized();
+        return ProtoMessage.mergeFrom(new LPFLCICNIOAEntry(), data).checkInitialized();
       }
 
-      public static FKDHDCGOIMFEntry parseFrom(final ProtoSource input) throws IOException {
-        return ProtoMessage.mergeFrom(new FKDHDCGOIMFEntry(), input).checkInitialized();
+      public static LPFLCICNIOAEntry parseFrom(final ProtoSource input) throws IOException {
+        return ProtoMessage.mergeFrom(new LPFLCICNIOAEntry(), input).checkInitialized();
       }
 
-      public static FKDHDCGOIMFEntry parseFrom(final JsonSource input) throws IOException {
-        return ProtoMessage.mergeFrom(new FKDHDCGOIMFEntry(), input).checkInitialized();
+      public static LPFLCICNIOAEntry parseFrom(final JsonSource input) throws IOException {
+        return ProtoMessage.mergeFrom(new LPFLCICNIOAEntry(), input).checkInitialized();
       }
 
       /**
-       * @return factory for creating FKDHDCGOIMFEntry messages
+       * @return factory for creating LPFLCICNIOAEntry messages
        */
-      public static MessageFactory getFactory() {
-        return FKDHDCGOIMFEntryFactory.INSTANCE;
+      public static MessageFactory getFactory() {
+        return LPFLCICNIOAEntryFactory.INSTANCE;
       }
 
-      private enum FKDHDCGOIMFEntryFactory implements MessageFactory {
+      private enum LPFLCICNIOAEntryFactory implements MessageFactory {
         INSTANCE;
 
         @Override
-        public FKDHDCGOIMFEntry create() {
-          return FKDHDCGOIMFEntry.newInstance();
+        public LPFLCICNIOAEntry create() {
+          return LPFLCICNIOAEntry.newInstance();
         }
       }
 
@@ -1277,23 +1285,23 @@ public final class NpcRogueInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName oENLKDCLEOA = FieldName.forField("OENLKDCLEOA");
+      static final FieldName dialogueId = FieldName.forField("dialogueId", "dialogue_id");
 
-      static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id");
+      static final FieldName kIAKKDIECME = FieldName.forField("KIAKKDIECME");
 
       static final FieldName eventId = FieldName.forField("eventId", "event_id");
 
-      static final FieldName dialogueId = FieldName.forField("dialogueId", "dialogue_id");
+      static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id");
 
-      static final FieldName jFCBEHNMGNO = FieldName.forField("JFCBEHNMGNO");
+      static final FieldName pHDDANOOOJI = FieldName.forField("PHDDANOOOJI");
 
-      static final FieldName jOFMIKFBGHP = FieldName.forField("JOFMIKFBGHP");
+      static final FieldName iDOFFGNNGEM = FieldName.forField("IDOFFGNNGEM");
 
       static final FieldName finishDialogue = FieldName.forField("finishDialogue", "finish_dialogue");
 
-      static final FieldName dialogueEventParamList = FieldName.forField("dialogueEventParamList", "dialogue_event_param_list");
+      static final FieldName lPFLCICNIOA = FieldName.forField("LPFLCICNIOA");
 
-      static final FieldName fKDHDCGOIMF = FieldName.forField("FKDHDCGOIMF");
+      static final FieldName dialogueEventParamList = FieldName.forField("dialogueEventParamList", "dialogue_event_param_list");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java
index cc2db5a..591f21e 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 = 3;
+     * optional uint32 npc_talk_id = 13;
      */
     private int npcTalkId;
 
@@ -34,7 +34,7 @@ public final class NpcTalkInfoOuterClass {
     }
 
     /**
-     * optional uint32 npc_talk_id = 3;
+     * optional uint32 npc_talk_id = 13;
      * @return whether the npcTalkId field is set
      */
     public boolean hasNpcTalkId() {
@@ -42,7 +42,7 @@ public final class NpcTalkInfoOuterClass {
     }
 
     /**
-     * optional uint32 npc_talk_id = 3;
+     * optional uint32 npc_talk_id = 13;
      * @return this
      */
     public NpcTalkInfo clearNpcTalkId() {
@@ -52,7 +52,7 @@ public final class NpcTalkInfoOuterClass {
     }
 
     /**
-     * optional uint32 npc_talk_id = 3;
+     * optional uint32 npc_talk_id = 13;
      * @return the npcTalkId
      */
     public int getNpcTalkId() {
@@ -60,7 +60,7 @@ public final class NpcTalkInfoOuterClass {
     }
 
     /**
-     * optional uint32 npc_talk_id = 3;
+     * optional uint32 npc_talk_id = 13;
      * @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) 24);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(npcTalkId);
       }
     }
@@ -150,7 +150,7 @@ public final class NpcTalkInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
+          case 104: {
             // 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 fb2e174..5dd31cb 100644
--- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java
@@ -21,17 +21,17 @@ public final class PVEBattleResultCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 battle_id = 3;
-     */
-    private int battleId;
-
-    /**
-     * optional uint32 stage_id = 6;
+     * optional uint32 stage_id = 5;
      */
     private int stageId;
 
     /**
-     * optional uint32 client_res_version = 7;
+     * optional uint32 battle_id = 9;
+     */
+    private int battleId;
+
+    /**
+     * optional uint32 client_res_version = 10;
      */
     private int clientResVersion;
 
@@ -41,27 +41,27 @@ public final class PVEBattleResultCsReqOuterClass {
     private int costTime;
 
     /**
-     * optional .BattleEndStatus end_status = 9;
+     * optional .BattleEndStatus end_status = 1;
      */
     private int endStatus;
 
     /**
-     * optional bool is_ai_consider_ultra_skill = 12;
+     * optional bool is_ai_consider_ultra_skill = 2;
      */
     private boolean isAiConsiderUltraSkill;
 
     /**
-     * optional .BattleStatistics stt = 5;
+     * optional .BattleStatistics stt = 12;
      */
     private final BattleStatisticsOuterClass.BattleStatistics stt = BattleStatisticsOuterClass.BattleStatistics.newInstance();
 
     /**
-     * optional bytes turn_snapshot_hash = 11;
+     * optional bytes turn_snapshot_hash = 8;
      */
     private final RepeatedByte turnSnapshotHash = RepeatedByte.newEmptyInstance();
 
     /**
-     * repeated .BattleOp op_list = 8;
+     * repeated .BattleOp op_list = 6;
      */
     private final RepeatedMessage opList = RepeatedMessage.newEmptyInstance(BattleOpOuterClass.BattleOp.getFactory());
 
@@ -76,62 +76,25 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional uint32 battle_id = 3;
-     * @return whether the battleId field is set
+     * optional uint32 stage_id = 5;
+     * @return whether the stageId field is set
      */
-    public boolean hasBattleId() {
+    public boolean hasStageId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 battle_id = 3;
-     * @return this
-     */
-    public PVEBattleResultCsReq clearBattleId() {
-      bitField0_ &= ~0x00000001;
-      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 PVEBattleResultCsReq setBattleId(final int value) {
-      bitField0_ |= 0x00000001;
-      battleId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 stage_id = 6;
-     * @return whether the stageId field is set
-     */
-    public boolean hasStageId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 stage_id = 6;
+     * optional uint32 stage_id = 5;
      * @return this
      */
     public PVEBattleResultCsReq clearStageId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       stageId = 0;
       return this;
     }
 
     /**
-     * optional uint32 stage_id = 6;
+     * optional uint32 stage_id = 5;
      * @return the stageId
      */
     public int getStageId() {
@@ -139,18 +102,55 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional uint32 stage_id = 6;
+     * optional uint32 stage_id = 5;
      * @param value the stageId to set
      * @return this
      */
     public PVEBattleResultCsReq setStageId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       stageId = value;
       return this;
     }
 
     /**
-     * optional uint32 client_res_version = 7;
+     * optional uint32 battle_id = 9;
+     * @return whether the battleId field is set
+     */
+    public boolean hasBattleId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 battle_id = 9;
+     * @return this
+     */
+    public PVEBattleResultCsReq clearBattleId() {
+      bitField0_ &= ~0x00000002;
+      battleId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 battle_id = 9;
+     * @return the battleId
+     */
+    public int getBattleId() {
+      return battleId;
+    }
+
+    /**
+     * optional uint32 battle_id = 9;
+     * @param value the battleId to set
+     * @return this
+     */
+    public PVEBattleResultCsReq setBattleId(final int value) {
+      bitField0_ |= 0x00000002;
+      battleId = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 client_res_version = 10;
      * @return whether the clientResVersion field is set
      */
     public boolean hasClientResVersion() {
@@ -158,7 +158,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional uint32 client_res_version = 7;
+     * optional uint32 client_res_version = 10;
      * @return this
      */
     public PVEBattleResultCsReq clearClientResVersion() {
@@ -168,7 +168,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional uint32 client_res_version = 7;
+     * optional uint32 client_res_version = 10;
      * @return the clientResVersion
      */
     public int getClientResVersion() {
@@ -176,7 +176,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional uint32 client_res_version = 7;
+     * optional uint32 client_res_version = 10;
      * @param value the clientResVersion to set
      * @return this
      */
@@ -224,7 +224,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleEndStatus end_status = 9;
+     * optional .BattleEndStatus end_status = 1;
      * @return whether the endStatus field is set
      */
     public boolean hasEndStatus() {
@@ -232,7 +232,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleEndStatus end_status = 9;
+     * optional .BattleEndStatus end_status = 1;
      * @return this
      */
     public PVEBattleResultCsReq clearEndStatus() {
@@ -242,7 +242,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleEndStatus end_status = 9;
+     * optional .BattleEndStatus end_status = 1;
      * @return the endStatus
      */
     public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() {
@@ -275,7 +275,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleEndStatus end_status = 9;
+     * optional .BattleEndStatus end_status = 1;
      * @param value the endStatus to set
      * @return this
      */
@@ -287,7 +287,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bool is_ai_consider_ultra_skill = 12;
+     * optional bool is_ai_consider_ultra_skill = 2;
      * @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 = 12;
+     * optional bool is_ai_consider_ultra_skill = 2;
      * @return this
      */
     public PVEBattleResultCsReq clearIsAiConsiderUltraSkill() {
@@ -305,7 +305,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bool is_ai_consider_ultra_skill = 12;
+     * optional bool is_ai_consider_ultra_skill = 2;
      * @return the isAiConsiderUltraSkill
      */
     public boolean getIsAiConsiderUltraSkill() {
@@ -313,7 +313,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bool is_ai_consider_ultra_skill = 12;
+     * optional bool is_ai_consider_ultra_skill = 2;
      * @param value the isAiConsiderUltraSkill to set
      * @return this
      */
@@ -324,7 +324,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleStatistics stt = 5;
+     * optional .BattleStatistics stt = 12;
      * @return whether the stt field is set
      */
     public boolean hasStt() {
@@ -332,7 +332,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleStatistics stt = 5;
+     * optional .BattleStatistics stt = 12;
      * @return this
      */
     public PVEBattleResultCsReq clearStt() {
@@ -342,7 +342,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleStatistics stt = 5;
+     * optional .BattleStatistics stt = 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.
@@ -356,7 +356,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleStatistics stt = 5;
+     * optional .BattleStatistics stt = 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
@@ -370,7 +370,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional .BattleStatistics stt = 5;
+     * optional .BattleStatistics stt = 12;
      * @param value the stt to set
      * @return this
      */
@@ -381,7 +381,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bytes turn_snapshot_hash = 11;
+     * optional bytes turn_snapshot_hash = 8;
      * @return whether the turnSnapshotHash field is set
      */
     public boolean hasTurnSnapshotHash() {
@@ -389,7 +389,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bytes turn_snapshot_hash = 11;
+     * optional bytes turn_snapshot_hash = 8;
      * @return this
      */
     public PVEBattleResultCsReq clearTurnSnapshotHash() {
@@ -399,7 +399,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bytes turn_snapshot_hash = 11;
+     * optional bytes turn_snapshot_hash = 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.
@@ -413,7 +413,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bytes turn_snapshot_hash = 11;
+     * optional bytes turn_snapshot_hash = 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
@@ -427,7 +427,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bytes turn_snapshot_hash = 11;
+     * optional bytes turn_snapshot_hash = 8;
      * @param value the turnSnapshotHash to add
      * @return this
      */
@@ -438,7 +438,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bytes turn_snapshot_hash = 11;
+     * optional bytes turn_snapshot_hash = 8;
      * @param values the turnSnapshotHash to add
      * @return this
      */
@@ -449,7 +449,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * optional bytes turn_snapshot_hash = 11;
+     * optional bytes turn_snapshot_hash = 8;
      * @param values the turnSnapshotHash to set
      * @return this
      */
@@ -460,7 +460,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * repeated .BattleOp op_list = 8;
+     * repeated .BattleOp op_list = 6;
      * @return whether the opList field is set
      */
     public boolean hasOpList() {
@@ -468,7 +468,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * repeated .BattleOp op_list = 8;
+     * repeated .BattleOp op_list = 6;
      * @return this
      */
     public PVEBattleResultCsReq clearOpList() {
@@ -478,7 +478,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * repeated .BattleOp op_list = 8;
+     * repeated .BattleOp op_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.
@@ -492,7 +492,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * repeated .BattleOp op_list = 8;
+     * repeated .BattleOp op_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
@@ -506,7 +506,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * repeated .BattleOp op_list = 8;
+     * repeated .BattleOp op_list = 6;
      * @param value the opList to add
      * @return this
      */
@@ -517,7 +517,7 @@ public final class PVEBattleResultCsReqOuterClass {
     }
 
     /**
-     * repeated .BattleOp op_list = 8;
+     * repeated .BattleOp op_list = 6;
      * @param values the opList to add
      * @return this
      */
@@ -532,8 +532,8 @@ public final class PVEBattleResultCsReqOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        battleId = other.battleId;
         stageId = other.stageId;
+        battleId = other.battleId;
         clientResVersion = other.clientResVersion;
         costTime = other.costTime;
         endStatus = other.endStatus;
@@ -551,12 +551,12 @@ public final class PVEBattleResultCsReqOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasBattleId()) {
-        setBattleId(other.battleId);
-      }
       if (other.hasStageId()) {
         setStageId(other.stageId);
       }
+      if (other.hasBattleId()) {
+        setBattleId(other.battleId);
+      }
       if (other.hasClientResVersion()) {
         setClientResVersion(other.clientResVersion);
       }
@@ -588,8 +588,8 @@ public final class PVEBattleResultCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      battleId = 0;
       stageId = 0;
+      battleId = 0;
       clientResVersion = 0;
       costTime = 0;
       endStatus = 0;
@@ -623,8 +623,8 @@ public final class PVEBattleResultCsReqOuterClass {
       }
       PVEBattleResultCsReq other = (PVEBattleResultCsReq) o;
       return bitField0_ == other.bitField0_
-        && (!hasBattleId() || battleId == other.battleId)
         && (!hasStageId() || stageId == other.stageId)
+        && (!hasBattleId() || battleId == other.battleId)
         && (!hasClientResVersion() || clientResVersion == other.clientResVersion)
         && (!hasCostTime() || costTime == other.costTime)
         && (!hasEndStatus() || endStatus == other.endStatus)
@@ -637,15 +637,15 @@ public final class PVEBattleResultCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 24);
-        output.writeUInt32NoTag(battleId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 48);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(stageId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 72);
+        output.writeUInt32NoTag(battleId);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(clientResVersion);
       }
       if ((bitField0_ & 0x00000008) != 0) {
@@ -653,24 +653,24 @@ public final class PVEBattleResultCsReqOuterClass {
         output.writeUInt32NoTag(costTime);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 72);
+        output.writeRawByte((byte) 8);
         output.writeEnumNoTag(endStatus);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 16);
         output.writeBoolNoTag(isAiConsiderUltraSkill);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 98);
         output.writeMessageNoTag(stt);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        output.writeRawByte((byte) 90);
+        output.writeRawByte((byte) 66);
         output.writeBytesNoTag(turnSnapshotHash);
       }
       if ((bitField0_ & 0x00000100) != 0) {
         for (int i = 0; i < opList.length(); i++) {
-          output.writeRawByte((byte) 66);
+          output.writeRawByte((byte) 50);
           output.writeMessageNoTag(opList.get(i));
         }
       }
@@ -680,10 +680,10 @@ public final class PVEBattleResultCsReqOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion);
@@ -716,25 +716,25 @@ public final class PVEBattleResultCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
-            // battleId
-            battleId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 48) {
-              break;
-            }
-          }
-          case 48: {
+          case 40: {
             // stageId
             stageId = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 72) {
               break;
             }
           }
-          case 56: {
+          case 72: {
+            // battleId
+            battleId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 80) {
+              break;
+            }
+          }
+          case 80: {
             // clientResVersion
             clientResVersion = input.readUInt32();
             bitField0_ |= 0x00000004;
@@ -748,11 +748,11 @@ public final class PVEBattleResultCsReqOuterClass {
             costTime = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 72) {
+            if (tag != 8) {
               break;
             }
           }
-          case 72: {
+          case 8: {
             // 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 != 96) {
+            if (tag != 16) {
               break;
             }
           }
-          case 96: {
+          case 16: {
             // isAiConsiderUltraSkill
             isAiConsiderUltraSkill = input.readBool();
             bitField0_ |= 0x00000020;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 98) {
               break;
             }
           }
-          case 42: {
+          case 98: {
             // stt
             input.readMessage(stt);
             bitField0_ |= 0x00000040;
             tag = input.readTag();
-            if (tag != 90) {
-              break;
-            }
-          }
-          case 90: {
-            // turnSnapshotHash
-            input.readBytes(turnSnapshotHash);
-            bitField0_ |= 0x00000080;
-            tag = input.readTag();
             if (tag != 66) {
               break;
             }
           }
           case 66: {
+            // turnSnapshotHash
+            input.readBytes(turnSnapshotHash);
+            bitField0_ |= 0x00000080;
+            tag = input.readTag();
+            if (tag != 50) {
+              break;
+            }
+          }
+          case 50: {
             // opList
             tag = input.readRepeatedMessage(opList, tag);
             bitField0_ |= 0x00000100;
@@ -817,10 +817,10 @@ public final class PVEBattleResultCsReqOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.battleId, battleId);
+        output.writeUInt32(FieldNames.stageId, stageId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.stageId, stageId);
+        output.writeUInt32(FieldNames.battleId, battleId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.clientResVersion, clientResVersion);
@@ -853,11 +853,11 @@ public final class PVEBattleResultCsReqOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -1678308365:
-          case -487930366: {
-            if (input.isAtField(FieldNames.battleId)) {
+          case -1897528135:
+          case 1306191356: {
+            if (input.isAtField(FieldNames.stageId)) {
               if (!input.trySkipNullValue()) {
-                battleId = input.readUInt32();
+                stageId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -865,11 +865,11 @@ public final class PVEBattleResultCsReqOuterClass {
             }
             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 {
@@ -1018,10 +1018,10 @@ public final class PVEBattleResultCsReqOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName battleId = FieldName.forField("battleId", "battle_id");
-
       static final FieldName stageId = FieldName.forField("stageId", "stage_id");
 
+      static final FieldName battleId = FieldName.forField("battleId", "battle_id");
+
       static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version");
 
       static final FieldName costTime = FieldName.forField("costTime", "cost_time");
diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java
index 710e4e7..e432e4b 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 mismatch_turn_count = 2;
-     */
-    private int mismatchTurnCount;
-
-    /**
-     * optional uint32 event_id = 3;
-     */
-    private int eventId;
-
-    /**
-     * optional uint32 stage_id = 4;
-     */
-    private int stageId;
-
-    /**
-     * optional uint32 retcode = 8;
+     * optional uint32 retcode = 3;
      */
     private int retcode;
 
     /**
-     * optional uint32 battle_id = 10;
+     * optional uint32 battle_id = 6;
      */
     private int battleId;
 
     /**
-     * optional .BattleEndStatus end_status = 7;
+     * optional uint32 stage_id = 11;
+     */
+    private int stageId;
+
+    /**
+     * optional uint32 mismatch_turn_count = 14;
+     */
+    private int mismatchTurnCount;
+
+    /**
+     * optional uint32 event_id = 15;
+     */
+    private int eventId;
+
+    /**
+     * optional .BattleEndStatus end_status = 2;
      */
     private int endStatus;
 
     /**
-     * optional bool check_identical = 1;
+     * optional bool check_identical = 4;
      */
     private boolean checkIdentical;
 
     /**
-     * optional .ItemList unk1 = 5;
+     * optional .ItemList unk1 = 1;
      */
     private final ItemListOuterClass.ItemList unk1 = ItemListOuterClass.ItemList.newInstance();
 
     /**
-     * optional .ItemList unk2 = 6;
-     */
-    private final ItemListOuterClass.ItemList unk2 = ItemListOuterClass.ItemList.newInstance();
-
-    /**
-     * optional .ItemList drop_data = 14;
+     * optional .ItemList drop_data = 5;
      */
     private final ItemListOuterClass.ItemList dropData = ItemListOuterClass.ItemList.newInstance();
 
     /**
-     * optional .ItemList unk3 = 1822;
+     * optional .ItemList unk2 = 8;
+     */
+    private final ItemListOuterClass.ItemList unk2 = ItemListOuterClass.ItemList.newInstance();
+
+    /**
+     * optional .ItemList unk3 = 73;
      */
     private final ItemListOuterClass.ItemList unk3 = ItemListOuterClass.ItemList.newInstance();
 
+    /**
+     * optional string bin_version = 10;
+     */
+    private final Utf8String binVersion = Utf8String.newEmptyInstance();
+
     /**
      * optional string res_version = 12;
      */
     private final Utf8String resVersion = Utf8String.newEmptyInstance();
 
     /**
-     * optional string bin_version = 15;
-     */
-    private final Utf8String binVersion = Utf8String.newEmptyInstance();
-
-    /**
-     * repeated .BattleAvatar battle_avatar_list = 11;
+     * repeated .BattleAvatar battle_avatar_list = 7;
      */
     private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory());
 
@@ -101,81 +101,81 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional uint32 mismatch_turn_count = 2;
-     * @return whether the mismatchTurnCount field is set
+     * optional uint32 retcode = 3;
+     * @return whether the retcode field is set
      */
-    public boolean hasMismatchTurnCount() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 mismatch_turn_count = 2;
+     * optional uint32 retcode = 3;
      * @return this
      */
-    public PVEBattleResultScRsp clearMismatchTurnCount() {
+    public PVEBattleResultScRsp clearRetcode() {
       bitField0_ &= ~0x00000001;
-      mismatchTurnCount = 0;
+      retcode = 0;
       return this;
     }
 
     /**
-     * optional uint32 mismatch_turn_count = 2;
-     * @return the mismatchTurnCount
+     * optional uint32 retcode = 3;
+     * @return the retcode
      */
-    public int getMismatchTurnCount() {
-      return mismatchTurnCount;
+    public int getRetcode() {
+      return retcode;
     }
 
     /**
-     * optional uint32 mismatch_turn_count = 2;
-     * @param value the mismatchTurnCount to set
+     * optional uint32 retcode = 3;
+     * @param value the retcode to set
      * @return this
      */
-    public PVEBattleResultScRsp setMismatchTurnCount(final int value) {
+    public PVEBattleResultScRsp setRetcode(final int value) {
       bitField0_ |= 0x00000001;
-      mismatchTurnCount = value;
+      retcode = value;
       return this;
     }
 
     /**
-     * optional uint32 event_id = 3;
-     * @return whether the eventId field is set
+     * optional uint32 battle_id = 6;
+     * @return whether the battleId field is set
      */
-    public boolean hasEventId() {
+    public boolean hasBattleId() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * optional uint32 event_id = 3;
+     * optional uint32 battle_id = 6;
      * @return this
      */
-    public PVEBattleResultScRsp clearEventId() {
+    public PVEBattleResultScRsp clearBattleId() {
       bitField0_ &= ~0x00000002;
-      eventId = 0;
+      battleId = 0;
       return this;
     }
 
     /**
-     * optional uint32 event_id = 3;
-     * @return the eventId
+     * optional uint32 battle_id = 6;
+     * @return the battleId
      */
-    public int getEventId() {
-      return eventId;
+    public int getBattleId() {
+      return battleId;
     }
 
     /**
-     * optional uint32 event_id = 3;
-     * @param value the eventId to set
+     * optional uint32 battle_id = 6;
+     * @param value the battleId to set
      * @return this
      */
-    public PVEBattleResultScRsp setEventId(final int value) {
+    public PVEBattleResultScRsp setBattleId(final int value) {
       bitField0_ |= 0x00000002;
-      eventId = value;
+      battleId = value;
       return this;
     }
 
     /**
-     * optional uint32 stage_id = 4;
+     * optional uint32 stage_id = 11;
      * @return whether the stageId field is set
      */
     public boolean hasStageId() {
@@ -183,7 +183,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional uint32 stage_id = 4;
+     * optional uint32 stage_id = 11;
      * @return this
      */
     public PVEBattleResultScRsp clearStageId() {
@@ -193,7 +193,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional uint32 stage_id = 4;
+     * optional uint32 stage_id = 11;
      * @return the stageId
      */
     public int getStageId() {
@@ -201,7 +201,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional uint32 stage_id = 4;
+     * optional uint32 stage_id = 11;
      * @param value the stageId to set
      * @return this
      */
@@ -212,81 +212,81 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 8;
-     * @return whether the retcode field is set
+     * optional uint32 mismatch_turn_count = 14;
+     * @return whether the mismatchTurnCount field is set
      */
-    public boolean hasRetcode() {
+    public boolean hasMismatchTurnCount() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * optional uint32 retcode = 8;
+     * optional uint32 mismatch_turn_count = 14;
      * @return this
      */
-    public PVEBattleResultScRsp clearRetcode() {
+    public PVEBattleResultScRsp clearMismatchTurnCount() {
       bitField0_ &= ~0x00000008;
-      retcode = 0;
+      mismatchTurnCount = 0;
       return this;
     }
 
     /**
-     * optional uint32 retcode = 8;
-     * @return the retcode
+     * optional uint32 mismatch_turn_count = 14;
+     * @return the mismatchTurnCount
      */
-    public int getRetcode() {
-      return retcode;
+    public int getMismatchTurnCount() {
+      return mismatchTurnCount;
     }
 
     /**
-     * optional uint32 retcode = 8;
-     * @param value the retcode to set
+     * optional uint32 mismatch_turn_count = 14;
+     * @param value the mismatchTurnCount to set
      * @return this
      */
-    public PVEBattleResultScRsp setRetcode(final int value) {
+    public PVEBattleResultScRsp setMismatchTurnCount(final int value) {
       bitField0_ |= 0x00000008;
-      retcode = value;
+      mismatchTurnCount = value;
       return this;
     }
 
     /**
-     * optional uint32 battle_id = 10;
-     * @return whether the battleId field is set
+     * optional uint32 event_id = 15;
+     * @return whether the eventId field is set
      */
-    public boolean hasBattleId() {
+    public boolean hasEventId() {
       return (bitField0_ & 0x00000010) != 0;
     }
 
     /**
-     * optional uint32 battle_id = 10;
+     * optional uint32 event_id = 15;
      * @return this
      */
-    public PVEBattleResultScRsp clearBattleId() {
+    public PVEBattleResultScRsp clearEventId() {
       bitField0_ &= ~0x00000010;
-      battleId = 0;
+      eventId = 0;
       return this;
     }
 
     /**
-     * optional uint32 battle_id = 10;
-     * @return the battleId
+     * optional uint32 event_id = 15;
+     * @return the eventId
      */
-    public int getBattleId() {
-      return battleId;
+    public int getEventId() {
+      return eventId;
     }
 
     /**
-     * optional uint32 battle_id = 10;
-     * @param value the battleId to set
+     * optional uint32 event_id = 15;
+     * @param value the eventId to set
      * @return this
      */
-    public PVEBattleResultScRsp setBattleId(final int value) {
+    public PVEBattleResultScRsp setEventId(final int value) {
       bitField0_ |= 0x00000010;
-      battleId = value;
+      eventId = value;
       return this;
     }
 
     /**
-     * optional .BattleEndStatus end_status = 7;
+     * optional .BattleEndStatus end_status = 2;
      * @return whether the endStatus field is set
      */
     public boolean hasEndStatus() {
@@ -294,7 +294,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .BattleEndStatus end_status = 7;
+     * optional .BattleEndStatus end_status = 2;
      * @return this
      */
     public PVEBattleResultScRsp clearEndStatus() {
@@ -304,7 +304,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .BattleEndStatus end_status = 7;
+     * optional .BattleEndStatus end_status = 2;
      * @return the endStatus
      */
     public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() {
@@ -337,7 +337,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .BattleEndStatus end_status = 7;
+     * optional .BattleEndStatus end_status = 2;
      * @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 = 4;
      * @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 = 4;
      * @return this
      */
     public PVEBattleResultScRsp clearCheckIdentical() {
@@ -367,7 +367,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional bool check_identical = 1;
+     * optional bool check_identical = 4;
      * @return the checkIdentical
      */
     public boolean getCheckIdentical() {
@@ -375,7 +375,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional bool check_identical = 1;
+     * optional bool check_identical = 4;
      * @param value the checkIdentical to set
      * @return this
      */
@@ -386,7 +386,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .ItemList unk1 = 5;
+     * optional .ItemList unk1 = 1;
      * @return whether the unk1 field is set
      */
     public boolean hasUnk1() {
@@ -394,7 +394,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .ItemList unk1 = 5;
+     * optional .ItemList unk1 = 1;
      * @return this
      */
     public PVEBattleResultScRsp clearUnk1() {
@@ -404,7 +404,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .ItemList unk1 = 5;
+     * optional .ItemList unk1 = 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 unk1 = 5;
+     * optional .ItemList unk1 = 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 unk1 = 5;
+     * optional .ItemList unk1 = 1;
      * @param value the unk1 to set
      * @return this
      */
@@ -443,82 +443,25 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .ItemList unk2 = 6;
-     * @return whether the unk2 field is set
+     * optional .ItemList drop_data = 5;
+     * @return whether the dropData field is set
      */
-    public boolean hasUnk2() {
+    public boolean hasDropData() {
       return (bitField0_ & 0x00000100) != 0;
     }
 
     /**
-     * optional .ItemList unk2 = 6;
-     * @return this
-     */
-    public PVEBattleResultScRsp clearUnk2() {
-      bitField0_ &= ~0x00000100;
-      unk2.clear();
-      return this;
-    }
-
-    /**
-     * optional .ItemList unk2 = 6;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableUnk2()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public ItemListOuterClass.ItemList getUnk2() {
-      return unk2;
-    }
-
-    /**
-     * optional .ItemList unk2 = 6;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public ItemListOuterClass.ItemList getMutableUnk2() {
-      bitField0_ |= 0x00000100;
-      return unk2;
-    }
-
-    /**
-     * optional .ItemList unk2 = 6;
-     * @param value the unk2 to set
-     * @return this
-     */
-    public PVEBattleResultScRsp setUnk2(final ItemListOuterClass.ItemList value) {
-      bitField0_ |= 0x00000100;
-      unk2.copyFrom(value);
-      return this;
-    }
-
-    /**
-     * optional .ItemList drop_data = 14;
-     * @return whether the dropData field is set
-     */
-    public boolean hasDropData() {
-      return (bitField0_ & 0x00000200) != 0;
-    }
-
-    /**
-     * optional .ItemList drop_data = 14;
+     * optional .ItemList drop_data = 5;
      * @return this
      */
     public PVEBattleResultScRsp clearDropData() {
-      bitField0_ &= ~0x00000200;
+      bitField0_ &= ~0x00000100;
       dropData.clear();
       return this;
     }
 
     /**
-     * optional .ItemList drop_data = 14;
+     * optional .ItemList drop_data = 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.
@@ -532,7 +475,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .ItemList drop_data = 14;
+     * optional .ItemList drop_data = 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
@@ -541,23 +484,80 @@ public final class PVEBattleResultScRspOuterClass {
      * @return internal storage object for modifications
      */
     public ItemListOuterClass.ItemList getMutableDropData() {
-      bitField0_ |= 0x00000200;
+      bitField0_ |= 0x00000100;
       return dropData;
     }
 
     /**
-     * optional .ItemList drop_data = 14;
+     * optional .ItemList drop_data = 5;
      * @param value the dropData to set
      * @return this
      */
     public PVEBattleResultScRsp setDropData(final ItemListOuterClass.ItemList value) {
-      bitField0_ |= 0x00000200;
+      bitField0_ |= 0x00000100;
       dropData.copyFrom(value);
       return this;
     }
 
     /**
-     * optional .ItemList unk3 = 1822;
+     * optional .ItemList unk2 = 8;
+     * @return whether the unk2 field is set
+     */
+    public boolean hasUnk2() {
+      return (bitField0_ & 0x00000200) != 0;
+    }
+
+    /**
+     * optional .ItemList unk2 = 8;
+     * @return this
+     */
+    public PVEBattleResultScRsp clearUnk2() {
+      bitField0_ &= ~0x00000200;
+      unk2.clear();
+      return this;
+    }
+
+    /**
+     * optional .ItemList unk2 = 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 #getMutableUnk2()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public ItemListOuterClass.ItemList getUnk2() {
+      return unk2;
+    }
+
+    /**
+     * optional .ItemList unk2 = 8;
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public ItemListOuterClass.ItemList getMutableUnk2() {
+      bitField0_ |= 0x00000200;
+      return unk2;
+    }
+
+    /**
+     * optional .ItemList unk2 = 8;
+     * @param value the unk2 to set
+     * @return this
+     */
+    public PVEBattleResultScRsp setUnk2(final ItemListOuterClass.ItemList value) {
+      bitField0_ |= 0x00000200;
+      unk2.copyFrom(value);
+      return this;
+    }
+
+    /**
+     * optional .ItemList unk3 = 73;
      * @return whether the unk3 field is set
      */
     public boolean hasUnk3() {
@@ -565,7 +565,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .ItemList unk3 = 1822;
+     * optional .ItemList unk3 = 73;
      * @return this
      */
     public PVEBattleResultScRsp clearUnk3() {
@@ -575,7 +575,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * optional .ItemList unk3 = 1822;
+     * optional .ItemList unk3 = 73;
      *
      * This 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 = 1822;
+     * optional .ItemList unk3 = 73;
      *
      * 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 = 1822;
+     * optional .ItemList unk3 = 73;
      * @param value the unk3 to set
      * @return this
      */
@@ -613,12 +613,77 @@ public final class PVEBattleResultScRspOuterClass {
       return this;
     }
 
+    /**
+     * optional string bin_version = 10;
+     * @return whether the binVersion field is set
+     */
+    public boolean hasBinVersion() {
+      return (bitField0_ & 0x00000800) != 0;
+    }
+
+    /**
+     * optional string bin_version = 10;
+     * @return this
+     */
+    public PVEBattleResultScRsp clearBinVersion() {
+      bitField0_ &= ~0x00000800;
+      binVersion.clear();
+      return this;
+    }
+
+    /**
+     * optional string bin_version = 10;
+     * @return the binVersion
+     */
+    public String getBinVersion() {
+      return binVersion.getString();
+    }
+
+    /**
+     * optional string bin_version = 10;
+     * @return internal {@code Utf8String} representation of binVersion for reading
+     */
+    public Utf8String getBinVersionBytes() {
+      return this.binVersion;
+    }
+
+    /**
+     * optional string bin_version = 10;
+     * @return internal {@code Utf8String} representation of binVersion for modifications
+     */
+    public Utf8String getMutableBinVersionBytes() {
+      bitField0_ |= 0x00000800;
+      return this.binVersion;
+    }
+
+    /**
+     * optional string bin_version = 10;
+     * @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 = 10;
+     * @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 = 12;
      * @return whether the resVersion field is set
      */
     public boolean hasResVersion() {
-      return (bitField0_ & 0x00000800) != 0;
+      return (bitField0_ & 0x00001000) != 0;
     }
 
     /**
@@ -626,7 +691,7 @@ public final class PVEBattleResultScRspOuterClass {
      * @return this
      */
     public PVEBattleResultScRsp clearResVersion() {
-      bitField0_ &= ~0x00000800;
+      bitField0_ &= ~0x00001000;
       resVersion.clear();
       return this;
     }
@@ -652,7 +717,7 @@ public final class PVEBattleResultScRspOuterClass {
      * @return internal {@code Utf8String} representation of resVersion for modifications
      */
     public Utf8String getMutableResVersionBytes() {
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00001000;
       return this.resVersion;
     }
 
@@ -662,7 +727,7 @@ public final class PVEBattleResultScRspOuterClass {
      * @return this
      */
     public PVEBattleResultScRsp setResVersion(final CharSequence value) {
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00001000;
       resVersion.copyFrom(value);
       return this;
     }
@@ -673,78 +738,13 @@ public final class PVEBattleResultScRspOuterClass {
      * @return this
      */
     public PVEBattleResultScRsp setResVersion(final Utf8String value) {
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00001000;
       resVersion.copyFrom(value);
       return this;
     }
 
     /**
-     * optional string bin_version = 15;
-     * @return whether the binVersion field is set
-     */
-    public boolean hasBinVersion() {
-      return (bitField0_ & 0x00001000) != 0;
-    }
-
-    /**
-     * optional string bin_version = 15;
-     * @return this
-     */
-    public PVEBattleResultScRsp clearBinVersion() {
-      bitField0_ &= ~0x00001000;
-      binVersion.clear();
-      return this;
-    }
-
-    /**
-     * optional string bin_version = 15;
-     * @return the binVersion
-     */
-    public String getBinVersion() {
-      return binVersion.getString();
-    }
-
-    /**
-     * optional string bin_version = 15;
-     * @return internal {@code Utf8String} representation of binVersion for reading
-     */
-    public Utf8String getBinVersionBytes() {
-      return this.binVersion;
-    }
-
-    /**
-     * optional string bin_version = 15;
-     * @return internal {@code Utf8String} representation of binVersion for modifications
-     */
-    public Utf8String getMutableBinVersionBytes() {
-      bitField0_ |= 0x00001000;
-      return this.binVersion;
-    }
-
-    /**
-     * optional string bin_version = 15;
-     * @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 = 15;
-     * @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 = 11;
+     * repeated .BattleAvatar battle_avatar_list = 7;
      * @return whether the battleAvatarList field is set
      */
     public boolean hasBattleAvatarList() {
@@ -752,7 +752,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * repeated .BattleAvatar battle_avatar_list = 11;
+     * repeated .BattleAvatar battle_avatar_list = 7;
      * @return this
      */
     public PVEBattleResultScRsp clearBattleAvatarList() {
@@ -762,7 +762,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * repeated .BattleAvatar battle_avatar_list = 11;
+     * repeated .BattleAvatar battle_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.
@@ -776,7 +776,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * repeated .BattleAvatar battle_avatar_list = 11;
+     * repeated .BattleAvatar battle_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
@@ -790,7 +790,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * repeated .BattleAvatar battle_avatar_list = 11;
+     * repeated .BattleAvatar battle_avatar_list = 7;
      * @param value the battleAvatarList to add
      * @return this
      */
@@ -802,7 +802,7 @@ public final class PVEBattleResultScRspOuterClass {
     }
 
     /**
-     * repeated .BattleAvatar battle_avatar_list = 11;
+     * repeated .BattleAvatar battle_avatar_list = 7;
      * @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_;
-        mismatchTurnCount = other.mismatchTurnCount;
-        eventId = other.eventId;
-        stageId = other.stageId;
         retcode = other.retcode;
         battleId = other.battleId;
+        stageId = other.stageId;
+        mismatchTurnCount = other.mismatchTurnCount;
+        eventId = other.eventId;
         endStatus = other.endStatus;
         checkIdentical = other.checkIdentical;
         unk1.copyFrom(other.unk1);
-        unk2.copyFrom(other.unk2);
         dropData.copyFrom(other.dropData);
+        unk2.copyFrom(other.unk2);
         unk3.copyFrom(other.unk3);
-        resVersion.copyFrom(other.resVersion);
         binVersion.copyFrom(other.binVersion);
+        resVersion.copyFrom(other.resVersion);
         battleAvatarList.copyFrom(other.battleAvatarList);
       }
       return this;
@@ -842,21 +842,21 @@ public final class PVEBattleResultScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasMismatchTurnCount()) {
-        setMismatchTurnCount(other.mismatchTurnCount);
-      }
-      if (other.hasEventId()) {
-        setEventId(other.eventId);
-      }
-      if (other.hasStageId()) {
-        setStageId(other.stageId);
-      }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
       if (other.hasBattleId()) {
         setBattleId(other.battleId);
       }
+      if (other.hasStageId()) {
+        setStageId(other.stageId);
+      }
+      if (other.hasMismatchTurnCount()) {
+        setMismatchTurnCount(other.mismatchTurnCount);
+      }
+      if (other.hasEventId()) {
+        setEventId(other.eventId);
+      }
       if (other.hasEndStatus()) {
         setEndStatusValue(other.endStatus);
       }
@@ -866,21 +866,21 @@ public final class PVEBattleResultScRspOuterClass {
       if (other.hasUnk1()) {
         getMutableUnk1().mergeFrom(other.unk1);
       }
-      if (other.hasUnk2()) {
-        getMutableUnk2().mergeFrom(other.unk2);
-      }
       if (other.hasDropData()) {
         getMutableDropData().mergeFrom(other.dropData);
       }
+      if (other.hasUnk2()) {
+        getMutableUnk2().mergeFrom(other.unk2);
+      }
       if (other.hasUnk3()) {
         getMutableUnk3().mergeFrom(other.unk3);
       }
-      if (other.hasResVersion()) {
-        getMutableResVersionBytes().copyFrom(other.resVersion);
-      }
       if (other.hasBinVersion()) {
         getMutableBinVersionBytes().copyFrom(other.binVersion);
       }
+      if (other.hasResVersion()) {
+        getMutableResVersionBytes().copyFrom(other.resVersion);
+      }
       if (other.hasBattleAvatarList()) {
         getMutableBattleAvatarList().addAll(other.battleAvatarList);
       }
@@ -894,19 +894,19 @@ public final class PVEBattleResultScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      mismatchTurnCount = 0;
-      eventId = 0;
-      stageId = 0;
       retcode = 0;
       battleId = 0;
+      stageId = 0;
+      mismatchTurnCount = 0;
+      eventId = 0;
       endStatus = 0;
       checkIdentical = false;
       unk1.clear();
-      unk2.clear();
       dropData.clear();
+      unk2.clear();
       unk3.clear();
-      resVersion.clear();
       binVersion.clear();
+      resVersion.clear();
       battleAvatarList.clear();
       return this;
     }
@@ -919,11 +919,11 @@ public final class PVEBattleResultScRspOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       unk1.clearQuick();
-      unk2.clearQuick();
       dropData.clearQuick();
+      unk2.clearQuick();
       unk3.clearQuick();
-      resVersion.clear();
       binVersion.clear();
+      resVersion.clear();
       battleAvatarList.clearQuick();
       return this;
     }
@@ -938,79 +938,79 @@ public final class PVEBattleResultScRspOuterClass {
       }
       PVEBattleResultScRsp other = (PVEBattleResultScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount)
-        && (!hasEventId() || eventId == other.eventId)
-        && (!hasStageId() || stageId == other.stageId)
         && (!hasRetcode() || retcode == other.retcode)
         && (!hasBattleId() || battleId == other.battleId)
+        && (!hasStageId() || stageId == other.stageId)
+        && (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount)
+        && (!hasEventId() || eventId == other.eventId)
         && (!hasEndStatus() || endStatus == other.endStatus)
         && (!hasCheckIdentical() || checkIdentical == other.checkIdentical)
         && (!hasUnk1() || unk1.equals(other.unk1))
-        && (!hasUnk2() || unk2.equals(other.unk2))
         && (!hasDropData() || dropData.equals(other.dropData))
+        && (!hasUnk2() || unk2.equals(other.unk2))
         && (!hasUnk3() || unk3.equals(other.unk3))
-        && (!hasResVersion() || resVersion.equals(other.resVersion))
         && (!hasBinVersion() || binVersion.equals(other.binVersion))
+        && (!hasResVersion() || resVersion.equals(other.resVersion))
         && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
-        output.writeUInt32NoTag(mismatchTurnCount);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 24);
-        output.writeUInt32NoTag(eventId);
+        output.writeRawByte((byte) 48);
+        output.writeUInt32NoTag(battleId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(stageId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 64);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(mismatchTurnCount);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 80);
-        output.writeUInt32NoTag(battleId);
+        output.writeRawByte((byte) 120);
+        output.writeUInt32NoTag(eventId);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 16);
         output.writeEnumNoTag(endStatus);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 32);
         output.writeBoolNoTag(checkIdentical);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 10);
         output.writeMessageNoTag(unk1);
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        output.writeRawByte((byte) 50);
-        output.writeMessageNoTag(unk2);
-      }
-      if ((bitField0_ & 0x00000200) != 0) {
-        output.writeRawByte((byte) 114);
+        output.writeRawByte((byte) 42);
         output.writeMessageNoTag(dropData);
       }
+      if ((bitField0_ & 0x00000200) != 0) {
+        output.writeRawByte((byte) 66);
+        output.writeMessageNoTag(unk2);
+      }
       if ((bitField0_ & 0x00000400) != 0) {
-        output.writeRawLittleEndian16((short) 29170);
+        output.writeRawLittleEndian16((short) 1226);
         output.writeMessageNoTag(unk3);
       }
       if ((bitField0_ & 0x00000800) != 0) {
+        output.writeRawByte((byte) 82);
+        output.writeStringNoTag(binVersion);
+      }
+      if ((bitField0_ & 0x00001000) != 0) {
         output.writeRawByte((byte) 98);
         output.writeStringNoTag(resVersion);
       }
-      if ((bitField0_ & 0x00001000) != 0) {
-        output.writeRawByte((byte) 122);
-        output.writeStringNoTag(binVersion);
-      }
       if ((bitField0_ & 0x00002000) != 0) {
         for (int i = 0; i < battleAvatarList.length(); i++) {
-          output.writeRawByte((byte) 90);
+          output.writeRawByte((byte) 58);
           output.writeMessageNoTag(battleAvatarList.get(i));
         }
       }
@@ -1020,19 +1020,19 @@ public final class PVEBattleResultScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(mismatchTurnCount);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(mismatchTurnCount);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus);
@@ -1044,19 +1044,19 @@ public final class PVEBattleResultScRspOuterClass {
         size += 1 + ProtoSink.computeMessageSizeNoTag(unk1);
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(unk2);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(dropData);
       }
       if ((bitField0_ & 0x00000200) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(dropData);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(unk2);
       }
       if ((bitField0_ & 0x00000400) != 0) {
         size += 2 + ProtoSink.computeMessageSizeNoTag(unk3);
       }
       if ((bitField0_ & 0x00000800) != 0) {
-        size += 1 + ProtoSink.computeStringSizeNoTag(resVersion);
+        size += 1 + ProtoSink.computeStringSizeNoTag(binVersion);
       }
       if ((bitField0_ & 0x00001000) != 0) {
-        size += 1 + ProtoSink.computeStringSizeNoTag(binVersion);
+        size += 1 + ProtoSink.computeStringSizeNoTag(resVersion);
       }
       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 16: {
-            // mismatchTurnCount
-            mismatchTurnCount = input.readUInt32();
+          case 24: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 24) {
+            if (tag != 48) {
               break;
             }
           }
-          case 24: {
-            // eventId
-            eventId = input.readUInt32();
+          case 48: {
+            // battleId
+            battleId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 88) {
               break;
             }
           }
-          case 32: {
+          case 88: {
             // stageId
             stageId = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 112) {
               break;
             }
           }
-          case 64: {
-            // retcode
-            retcode = input.readUInt32();
+          case 112: {
+            // mismatchTurnCount
+            mismatchTurnCount = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 80) {
+            if (tag != 120) {
               break;
             }
           }
-          case 80: {
-            // battleId
-            battleId = input.readUInt32();
+          case 120: {
+            // eventId
+            eventId = input.readUInt32();
             bitField0_ |= 0x00000010;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 16) {
               break;
             }
           }
-          case 56: {
+          case 16: {
             // endStatus
             final int value = input.readInt32();
             if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) {
@@ -1124,51 +1124,60 @@ public final class PVEBattleResultScRspOuterClass {
               bitField0_ |= 0x00000020;
             }
             tag = input.readTag();
-            if (tag != 8) {
+            if (tag != 32) {
               break;
             }
           }
-          case 8: {
+          case 32: {
             // checkIdentical
             checkIdentical = input.readBool();
             bitField0_ |= 0x00000040;
             tag = input.readTag();
+            if (tag != 10) {
+              break;
+            }
+          }
+          case 10: {
+            // unk1
+            input.readMessage(unk1);
+            bitField0_ |= 0x00000080;
+            tag = input.readTag();
             if (tag != 42) {
               break;
             }
           }
           case 42: {
-            // unk1
-            input.readMessage(unk1);
-            bitField0_ |= 0x00000080;
-            tag = input.readTag();
-            if (tag != 50) {
-              break;
-            }
-          }
-          case 50: {
-            // unk2
-            input.readMessage(unk2);
-            bitField0_ |= 0x00000100;
-            tag = input.readTag();
-            if (tag != 114) {
-              break;
-            }
-          }
-          case 114: {
             // dropData
             input.readMessage(dropData);
-            bitField0_ |= 0x00000200;
+            bitField0_ |= 0x00000100;
             tag = input.readTag();
-            if (tag != 14578) {
+            if (tag != 66) {
               break;
             }
           }
-          case 14578: {
+          case 66: {
+            // unk2
+            input.readMessage(unk2);
+            bitField0_ |= 0x00000200;
+            tag = input.readTag();
+            if (tag != 586) {
+              break;
+            }
+          }
+          case 586: {
             // unk3
             input.readMessage(unk3);
             bitField0_ |= 0x00000400;
             tag = input.readTag();
+            if (tag != 82) {
+              break;
+            }
+          }
+          case 82: {
+            // binVersion
+            input.readString(binVersion);
+            bitField0_ |= 0x00000800;
+            tag = input.readTag();
             if (tag != 98) {
               break;
             }
@@ -1176,22 +1185,13 @@ public final class PVEBattleResultScRspOuterClass {
           case 98: {
             // resVersion
             input.readString(resVersion);
-            bitField0_ |= 0x00000800;
-            tag = input.readTag();
-            if (tag != 122) {
-              break;
-            }
-          }
-          case 122: {
-            // binVersion
-            input.readString(binVersion);
             bitField0_ |= 0x00001000;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 58) {
               break;
             }
           }
-          case 90: {
+          case 58: {
             // battleAvatarList
             tag = input.readRepeatedMessage(battleAvatarList, tag);
             bitField0_ |= 0x00002000;
@@ -1217,19 +1217,19 @@ public final class PVEBattleResultScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.mismatchTurnCount, mismatchTurnCount);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.eventId, eventId);
+        output.writeUInt32(FieldNames.battleId, battleId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.stageId, stageId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.mismatchTurnCount, mismatchTurnCount);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeUInt32(FieldNames.battleId, battleId);
+        output.writeUInt32(FieldNames.eventId, eventId);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter());
@@ -1241,19 +1241,19 @@ public final class PVEBattleResultScRspOuterClass {
         output.writeMessage(FieldNames.unk1, unk1);
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        output.writeMessage(FieldNames.unk2, unk2);
+        output.writeMessage(FieldNames.dropData, dropData);
       }
       if ((bitField0_ & 0x00000200) != 0) {
-        output.writeMessage(FieldNames.dropData, dropData);
+        output.writeMessage(FieldNames.unk2, unk2);
       }
       if ((bitField0_ & 0x00000400) != 0) {
         output.writeMessage(FieldNames.unk3, unk3);
       }
       if ((bitField0_ & 0x00000800) != 0) {
-        output.writeString(FieldNames.resVersion, resVersion);
+        output.writeString(FieldNames.binVersion, binVersion);
       }
       if ((bitField0_ & 0x00001000) != 0) {
-        output.writeString(FieldNames.binVersion, binVersion);
+        output.writeString(FieldNames.resVersion, resVersion);
       }
       if ((bitField0_ & 0x00002000) != 0) {
         output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList);
@@ -1268,11 +1268,10 @@ public final class PVEBattleResultScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -2096079772:
-          case -1800906274: {
-            if (input.isAtField(FieldNames.mismatchTurnCount)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                mismatchTurnCount = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -1280,11 +1279,11 @@ public final class PVEBattleResultScRspOuterClass {
             }
             break;
           }
-          case -1376502443:
-          case 278118624: {
-            if (input.isAtField(FieldNames.eventId)) {
+          case -1678308365:
+          case -487930366: {
+            if (input.isAtField(FieldNames.battleId)) {
               if (!input.trySkipNullValue()) {
-                eventId = input.readUInt32();
+                battleId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -1304,10 +1303,11 @@ public final class PVEBattleResultScRspOuterClass {
             }
             break;
           }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case -2096079772:
+          case -1800906274: {
+            if (input.isAtField(FieldNames.mismatchTurnCount)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                mismatchTurnCount = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -1315,11 +1315,11 @@ public final class PVEBattleResultScRspOuterClass {
             }
             break;
           }
-          case -1678308365:
-          case -487930366: {
-            if (input.isAtField(FieldNames.battleId)) {
+          case -1376502443:
+          case 278118624: {
+            if (input.isAtField(FieldNames.eventId)) {
               if (!input.trySkipNullValue()) {
-                battleId = input.readUInt32();
+                eventId = input.readUInt32();
                 bitField0_ |= 0x00000010;
               }
             } else {
@@ -1367,10 +1367,11 @@ public final class PVEBattleResultScRspOuterClass {
             }
             break;
           }
-          case 3594624: {
-            if (input.isAtField(FieldNames.unk2)) {
+          case -433028295:
+          case -513968390: {
+            if (input.isAtField(FieldNames.dropData)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(unk2);
+                input.readMessage(dropData);
                 bitField0_ |= 0x00000100;
               }
             } else {
@@ -1378,11 +1379,10 @@ public final class PVEBattleResultScRspOuterClass {
             }
             break;
           }
-          case -433028295:
-          case -513968390: {
-            if (input.isAtField(FieldNames.dropData)) {
+          case 3594624: {
+            if (input.isAtField(FieldNames.unk2)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(dropData);
+                input.readMessage(unk2);
                 bitField0_ |= 0x00000200;
               }
             } else {
@@ -1401,11 +1401,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_ |= 0x00000800;
               }
             } else {
@@ -1413,11 +1413,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_ |= 0x00001000;
               }
             } else {
@@ -1490,32 +1490,32 @@ public final class PVEBattleResultScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName mismatchTurnCount = FieldName.forField("mismatchTurnCount", "mismatch_turn_count");
-
-      static final FieldName eventId = FieldName.forField("eventId", "event_id");
-
-      static final FieldName stageId = FieldName.forField("stageId", "stage_id");
-
       static final FieldName retcode = FieldName.forField("retcode");
 
       static final FieldName battleId = FieldName.forField("battleId", "battle_id");
 
+      static final FieldName stageId = FieldName.forField("stageId", "stage_id");
+
+      static final FieldName mismatchTurnCount = FieldName.forField("mismatchTurnCount", "mismatch_turn_count");
+
+      static final FieldName eventId = FieldName.forField("eventId", "event_id");
+
       static final FieldName endStatus = FieldName.forField("endStatus", "end_status");
 
       static final FieldName checkIdentical = FieldName.forField("checkIdentical", "check_identical");
 
       static final FieldName unk1 = FieldName.forField("unk1");
 
-      static final FieldName unk2 = FieldName.forField("unk2");
-
       static final FieldName dropData = FieldName.forField("dropData", "drop_data");
 
+      static final FieldName unk2 = FieldName.forField("unk2");
+
       static final FieldName unk3 = FieldName.forField("unk3");
 
-      static final FieldName resVersion = FieldName.forField("resVersion", "res_version");
-
       static final FieldName binVersion = FieldName.forField("binVersion", "bin_version");
 
+      static final FieldName resVersion = FieldName.forField("resVersion", "res_version");
+
       static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list");
     }
   }
diff --git a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java
index 31971ca..496fdbb 100644
--- a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java
@@ -20,7 +20,7 @@ public final class PickRogueAvatarCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * repeated uint32 base_avatar_list = 3;
+     * repeated uint32 base_avatar_list = 2;
      */
     private final RepeatedInt baseAvatarList = RepeatedInt.newEmptyInstance();
 
@@ -35,7 +35,7 @@ public final class PickRogueAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 3;
+     * repeated uint32 base_avatar_list = 2;
      * @return whether the baseAvatarList field is set
      */
     public boolean hasBaseAvatarList() {
@@ -43,7 +43,7 @@ public final class PickRogueAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 3;
+     * repeated uint32 base_avatar_list = 2;
      * @return this
      */
     public PickRogueAvatarCsReq clearBaseAvatarList() {
@@ -53,7 +53,7 @@ public final class PickRogueAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 3;
+     * repeated uint32 base_avatar_list = 2;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class PickRogueAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 3;
+     * repeated uint32 base_avatar_list = 2;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class PickRogueAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 3;
+     * repeated uint32 base_avatar_list = 2;
      * @param value the baseAvatarList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class PickRogueAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 3;
+     * repeated uint32 base_avatar_list = 2;
      * @param values the baseAvatarList to add
      * @return this
      */
@@ -163,7 +163,7 @@ public final class PickRogueAvatarCsReqOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         for (int i = 0; i < baseAvatarList.length(); i++) {
-          output.writeRawByte((byte) 24);
+          output.writeRawByte((byte) 16);
           output.writeUInt32NoTag(baseAvatarList.array()[i]);
         }
       }
@@ -185,7 +185,7 @@ public final class PickRogueAvatarCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 26: {
+          case 18: {
             // baseAvatarList [packed=true]
             input.readPackedUInt32(baseAvatarList, tag);
             bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class PickRogueAvatarCsReqOuterClass {
             tag = input.readTag();
             break;
           }
-          case 24: {
+          case 16: {
             // baseAvatarList [packed=false]
             tag = input.readRepeatedUInt32(baseAvatarList, tag);
             bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java
index 56ad601..5b6abf0 100644
--- a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java
@@ -20,7 +20,7 @@ public final class PickRogueAvatarScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * repeated uint32 base_avatar_list = 6;
+     * repeated uint32 base_avatar_list = 7;
      */
     private final RepeatedInt baseAvatarList = RepeatedInt.newEmptyInstance();
 
@@ -35,7 +35,7 @@ public final class PickRogueAvatarScRspOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 6;
+     * repeated uint32 base_avatar_list = 7;
      * @return whether the baseAvatarList field is set
      */
     public boolean hasBaseAvatarList() {
@@ -43,7 +43,7 @@ public final class PickRogueAvatarScRspOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 6;
+     * repeated uint32 base_avatar_list = 7;
      * @return this
      */
     public PickRogueAvatarScRsp clearBaseAvatarList() {
@@ -53,7 +53,7 @@ public final class PickRogueAvatarScRspOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 6;
+     * repeated uint32 base_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 PickRogueAvatarScRspOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 6;
+     * repeated uint32 base_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 PickRogueAvatarScRspOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 6;
+     * repeated uint32 base_avatar_list = 7;
      * @param value the baseAvatarList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class PickRogueAvatarScRspOuterClass {
     }
 
     /**
-     * repeated uint32 base_avatar_list = 6;
+     * repeated uint32 base_avatar_list = 7;
      * @param values the baseAvatarList to add
      * @return this
      */
@@ -163,7 +163,7 @@ public final class PickRogueAvatarScRspOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         for (int i = 0; i < baseAvatarList.length(); i++) {
-          output.writeRawByte((byte) 48);
+          output.writeRawByte((byte) 56);
           output.writeUInt32NoTag(baseAvatarList.array()[i]);
         }
       }
@@ -185,7 +185,7 @@ public final class PickRogueAvatarScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 50: {
+          case 58: {
             // baseAvatarList [packed=true]
             input.readPackedUInt32(baseAvatarList, tag);
             bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class PickRogueAvatarScRspOuterClass {
             tag = input.readTag();
             break;
           }
-          case 48: {
+          case 56: {
             // baseAvatarList [packed=false]
             tag = input.readRepeatedUInt32(baseAvatarList, tag);
             bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java
index 499bbad..f257fc0 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_id = 1;
-     */
-    private int itemId;
-
-    /**
-     * optional uint32 item_num = 8;
+     * optional uint32 item_num = 12;
      */
     private int itemNum;
 
+    /**
+     * optional uint32 item_id = 14;
+     */
+    private int itemId;
+
     private PileItem() {
     }
 
@@ -39,62 +39,25 @@ public final class PileItemOuterClass {
     }
 
     /**
-     * optional uint32 item_id = 1;
-     * @return whether the itemId field is set
+     * optional uint32 item_num = 12;
+     * @return whether the itemNum field is set
      */
-    public boolean hasItemId() {
+    public boolean hasItemNum() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 item_id = 1;
-     * @return this
-     */
-    public PileItem 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 PileItem setItemId(final int value) {
-      bitField0_ |= 0x00000001;
-      itemId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 item_num = 8;
-     * @return whether the itemNum field is set
-     */
-    public boolean hasItemNum() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 item_num = 8;
+     * optional uint32 item_num = 12;
      * @return this
      */
     public PileItem clearItemNum() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       itemNum = 0;
       return this;
     }
 
     /**
-     * optional uint32 item_num = 8;
+     * optional uint32 item_num = 12;
      * @return the itemNum
      */
     public int getItemNum() {
@@ -102,23 +65,60 @@ public final class PileItemOuterClass {
     }
 
     /**
-     * optional uint32 item_num = 8;
+     * optional uint32 item_num = 12;
      * @param value the itemNum to set
      * @return this
      */
     public PileItem setItemNum(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       itemNum = value;
       return this;
     }
 
+    /**
+     * optional uint32 item_id = 14;
+     * @return whether the itemId field is set
+     */
+    public boolean hasItemId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 item_id = 14;
+     * @return this
+     */
+    public PileItem clearItemId() {
+      bitField0_ &= ~0x00000002;
+      itemId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 item_id = 14;
+     * @return the itemId
+     */
+    public int getItemId() {
+      return itemId;
+    }
+
+    /**
+     * optional uint32 item_id = 14;
+     * @param value the itemId to set
+     * @return this
+     */
+    public PileItem setItemId(final int value) {
+      bitField0_ |= 0x00000002;
+      itemId = value;
+      return this;
+    }
+
     @Override
     public PileItem copyFrom(final PileItem other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        itemId = other.itemId;
         itemNum = other.itemNum;
+        itemId = other.itemId;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class PileItemOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasItemId()) {
-        setItemId(other.itemId);
-      }
       if (other.hasItemNum()) {
         setItemNum(other.itemNum);
       }
+      if (other.hasItemId()) {
+        setItemId(other.itemId);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class PileItemOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      itemId = 0;
       itemNum = 0;
+      itemId = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class PileItemOuterClass {
       }
       PileItem other = (PileItem) o;
       return bitField0_ == other.bitField0_
-        && (!hasItemId() || itemId == other.itemId)
-        && (!hasItemNum() || itemNum == other.itemNum);
+        && (!hasItemNum() || itemNum == other.itemNum)
+        && (!hasItemId() || itemId == other.itemId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeUInt32NoTag(itemId);
+        output.writeRawByte((byte) 96);
+        output.writeUInt32NoTag(itemNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 64);
-        output.writeUInt32NoTag(itemNum);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(itemId);
       }
     }
 
@@ -190,10 +190,10 @@ public final class PileItemOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class PileItemOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
-            // itemId
-            itemId = input.readUInt32();
+          case 96: {
+            // itemNum
+            itemNum = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 112) {
               break;
             }
           }
-          case 64: {
-            // itemNum
-            itemNum = input.readUInt32();
+          case 112: {
+            // itemId
+            itemId = 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.itemId, itemId);
+        output.writeUInt32(FieldNames.itemNum, itemNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.itemNum, itemNum);
+        output.writeUInt32(FieldNames.itemId, itemId);
       }
       output.endObject();
     }
@@ -256,11 +256,11 @@ public final class PileItemOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          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_ |= 0x00000001;
               }
             } else {
@@ -268,11 +268,11 @@ public final class PileItemOuterClass {
             }
             break;
           }
-          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_ |= 0x00000002;
               }
             } else {
@@ -332,9 +332,9 @@ public final class PileItemOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName itemId = FieldName.forField("itemId", "item_id");
-
       static final FieldName itemNum = FieldName.forField("itemNum", "item_num");
+
+      static final FieldName itemId = FieldName.forField("itemId", "item_id");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/PlatformTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlatformTypeOuterClass.java
index 79eff87..4f78b06 100644
--- a/src/generated/main/emu/lunarcore/proto/PlatformTypeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlatformTypeOuterClass.java
@@ -237,7 +237,7 @@ public final class PlatformTypeOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return PlatformTypeConverter.INSTANCE;
     }
 
@@ -259,7 +259,7 @@ public final class PlatformTypeOuterClass {
       return value == null ? other : value;
     }
 
-    enum PlatformTypeConverter implements EnumConverter {
+    enum PlatformTypeConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       private static final PlatformType[] lookup = new PlatformType[26];
diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java
index 68fff08..a44a0b9 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 = 2;
+     * optional uint32 play_music_id = 12;
      */
     private int playMusicId;
 
@@ -34,7 +34,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
     }
 
     /**
-     * optional uint32 play_music_id = 2;
+     * optional uint32 play_music_id = 12;
      * @return whether the playMusicId field is set
      */
     public boolean hasPlayMusicId() {
@@ -42,7 +42,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
     }
 
     /**
-     * optional uint32 play_music_id = 2;
+     * optional uint32 play_music_id = 12;
      * @return this
      */
     public PlayBackGroundMusicCsReq clearPlayMusicId() {
@@ -52,7 +52,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
     }
 
     /**
-     * optional uint32 play_music_id = 2;
+     * optional uint32 play_music_id = 12;
      * @return the playMusicId
      */
     public int getPlayMusicId() {
@@ -60,7 +60,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
     }
 
     /**
-     * optional uint32 play_music_id = 2;
+     * optional uint32 play_music_id = 12;
      * @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) 16);
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(playMusicId);
       }
     }
@@ -150,7 +150,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
+          case 96: {
             // 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 584389e..8c7e619 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java
@@ -18,6 +18,11 @@ public final class PlayBackGroundMusicScRspOuterClass {
   public static final class PlayBackGroundMusicScRsp extends ProtoMessage implements Cloneable {
     private static final long serialVersionUID = 0L;
 
+    /**
+     * optional uint32 retcode = 1;
+     */
+    private int retcode;
+
     /**
      * optional uint32 play_music_id = 7;
      */
@@ -28,11 +33,6 @@ public final class PlayBackGroundMusicScRspOuterClass {
      */
     private int playingId;
 
-    /**
-     * optional uint32 retcode = 11;
-     */
-    private int retcode;
-
     private PlayBackGroundMusicScRsp() {
     }
 
@@ -43,12 +43,49 @@ public final class PlayBackGroundMusicScRspOuterClass {
       return new PlayBackGroundMusicScRsp();
     }
 
+    /**
+     * optional uint32 retcode = 1;
+     * @return whether the retcode field is set
+     */
+    public boolean hasRetcode() {
+      return (bitField0_ & 0x00000001) != 0;
+    }
+
+    /**
+     * optional uint32 retcode = 1;
+     * @return this
+     */
+    public PlayBackGroundMusicScRsp 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 PlayBackGroundMusicScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000001;
+      retcode = value;
+      return this;
+    }
+
     /**
      * optional uint32 play_music_id = 7;
      * @return whether the playMusicId field is set
      */
     public boolean hasPlayMusicId() {
-      return (bitField0_ & 0x00000001) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
@@ -56,7 +93,7 @@ public final class PlayBackGroundMusicScRspOuterClass {
      * @return this
      */
     public PlayBackGroundMusicScRsp clearPlayMusicId() {
-      bitField0_ &= ~0x00000001;
+      bitField0_ &= ~0x00000002;
       playMusicId = 0;
       return this;
     }
@@ -75,7 +112,7 @@ public final class PlayBackGroundMusicScRspOuterClass {
      * @return this
      */
     public PlayBackGroundMusicScRsp setPlayMusicId(final int value) {
-      bitField0_ |= 0x00000001;
+      bitField0_ |= 0x00000002;
       playMusicId = value;
       return this;
     }
@@ -85,7 +122,7 @@ public final class PlayBackGroundMusicScRspOuterClass {
      * @return whether the playingId field is set
      */
     public boolean hasPlayingId() {
-      return (bitField0_ & 0x00000002) != 0;
+      return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
@@ -93,7 +130,7 @@ public final class PlayBackGroundMusicScRspOuterClass {
      * @return this
      */
     public PlayBackGroundMusicScRsp clearPlayingId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000004;
       playingId = 0;
       return this;
     }
@@ -112,45 +149,8 @@ public final class PlayBackGroundMusicScRspOuterClass {
      * @return this
      */
     public PlayBackGroundMusicScRsp setPlayingId(final int value) {
-      bitField0_ |= 0x00000002;
-      playingId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 retcode = 11;
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * optional uint32 retcode = 11;
-     * @return this
-     */
-    public PlayBackGroundMusicScRsp clearRetcode() {
-      bitField0_ &= ~0x00000004;
-      retcode = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 retcode = 11;
-     * @return the retcode
-     */
-    public int getRetcode() {
-      return retcode;
-    }
-
-    /**
-     * optional uint32 retcode = 11;
-     * @param value the retcode to set
-     * @return this
-     */
-    public PlayBackGroundMusicScRsp setRetcode(final int value) {
       bitField0_ |= 0x00000004;
-      retcode = value;
+      playingId = value;
       return this;
     }
 
@@ -159,9 +159,9 @@ public final class PlayBackGroundMusicScRspOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
+        retcode = other.retcode;
         playMusicId = other.playMusicId;
         playingId = other.playingId;
-        retcode = other.retcode;
       }
       return this;
     }
@@ -172,15 +172,15 @@ public final class PlayBackGroundMusicScRspOuterClass {
         return this;
       }
       cachedSize = -1;
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
+      }
       if (other.hasPlayMusicId()) {
         setPlayMusicId(other.playMusicId);
       }
       if (other.hasPlayingId()) {
         setPlayingId(other.playingId);
       }
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
-      }
       return this;
     }
 
@@ -191,9 +191,9 @@ public final class PlayBackGroundMusicScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
+      retcode = 0;
       playMusicId = 0;
       playingId = 0;
-      retcode = 0;
       return this;
     }
 
@@ -217,38 +217,38 @@ public final class PlayBackGroundMusicScRspOuterClass {
       }
       PlayBackGroundMusicScRsp other = (PlayBackGroundMusicScRsp) o;
       return bitField0_ == other.bitField0_
+        && (!hasRetcode() || retcode == other.retcode)
         && (!hasPlayMusicId() || playMusicId == other.playMusicId)
-        && (!hasPlayingId() || playingId == other.playingId)
-        && (!hasRetcode() || retcode == other.retcode);
+        && (!hasPlayingId() || playingId == other.playingId);
     }
 
     @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) 56);
         output.writeUInt32NoTag(playMusicId);
       }
-      if ((bitField0_ & 0x00000002) != 0) {
+      if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(playingId);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(retcode);
-      }
     }
 
     @Override
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId);
       }
       return size;
     }
@@ -260,10 +260,19 @@ public final class PlayBackGroundMusicScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
+          case 8: {
+            // retcode
+            retcode = input.readUInt32();
+            bitField0_ |= 0x00000001;
+            tag = input.readTag();
+            if (tag != 56) {
+              break;
+            }
+          }
           case 56: {
             // playMusicId
             playMusicId = input.readUInt32();
-            bitField0_ |= 0x00000001;
+            bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 80) {
               break;
@@ -272,15 +281,6 @@ public final class PlayBackGroundMusicScRspOuterClass {
           case 80: {
             // playingId
             playingId = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
-            // retcode
-            retcode = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 0) {
@@ -305,13 +305,13 @@ public final class PlayBackGroundMusicScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.playMusicId, playMusicId);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.playingId, playingId);
+        output.writeUInt32(FieldNames.playMusicId, playMusicId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.playingId, playingId);
       }
       output.endObject();
     }
@@ -323,12 +323,23 @@ public final class PlayBackGroundMusicScRspOuterClass {
       }
       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 835898444:
           case -1319856608: {
             if (input.isAtField(FieldNames.playMusicId)) {
               if (!input.trySkipNullValue()) {
                 playMusicId = input.readUInt32();
-                bitField0_ |= 0x00000001;
+                bitField0_ |= 0x00000002;
               }
             } else {
               input.skipUnknownField();
@@ -340,17 +351,6 @@ public final class PlayBackGroundMusicScRspOuterClass {
             if (input.isAtField(FieldNames.playingId)) {
               if (!input.trySkipNullValue()) {
                 playingId = input.readUInt32();
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
-              if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -411,11 +411,11 @@ public final class PlayBackGroundMusicScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
+      static final FieldName retcode = FieldName.forField("retcode");
+
       static final FieldName playMusicId = FieldName.forField("playMusicId", "play_music_id");
 
       static final FieldName playingId = FieldName.forField("playingId", "playing_id");
-
-      static final FieldName retcode = FieldName.forField("retcode");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java
index 6681328..fe41bed 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java
@@ -15,33 +15,37 @@ import us.hebi.quickbuf.Utf8String;
 
 public final class PlayerDetailInfoOuterClass {
   /**
+   * 
+   *  TODO: verify DisplayAvatarDetailInfo repeateds
+   * 

+   *
    * Protobuf type {@code PlayerDetailInfo}
    */
   public static final class PlayerDetailInfo extends ProtoMessage implements Cloneable {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 world_level = 6;
+     * optional uint32 world_level = 5;
      */
     private int worldLevel;
 
     /**
-     * optional uint32 uid = 9;
-     */
-    private int uid;
-
-    /**
-     * optional uint32 head_icon = 12;
+     * optional uint32 head_icon = 8;
      */
     private int headIcon;
 
     /**
-     * optional uint32 level = 14;
+     * optional uint32 uid = 13;
+     */
+    private int uid;
+
+    /**
+     * optional uint32 level = 15;
      */
     private int level;
 
     /**
-     * optional .PlatformType platform_type = 5;
+     * optional .PlatformType platform_type = 3;
      */
     private int platformType;
 
@@ -51,37 +55,37 @@ public final class PlayerDetailInfoOuterClass {
     private boolean showDisplayAvatars;
 
     /**
-     * optional bool is_banned = 11;
+     * optional bool is_banned = 12;
      */
     private boolean isBanned;
 
     /**
-     * optional .PlayerRecordInfo record_info = 13;
+     * optional .PlayerRecordInfo record_info = 7;
      */
     private final PlayerRecordInfoOuterClass.PlayerRecordInfo recordInfo = PlayerRecordInfoOuterClass.PlayerRecordInfo.newInstance();
 
     /**
-     * optional .PlayerDisplaySettings display_settings = 1265;
+     * optional .PlayerDisplaySettings display_settings = 1743;
      */
     private final PlayerDisplaySettingsOuterClass.PlayerDisplaySettings displaySettings = PlayerDisplaySettingsOuterClass.PlayerDisplaySettings.newInstance();
 
     /**
-     * optional string nickname = 2;
+     * optional string nickname = 4;
      */
     private final Utf8String nickname = Utf8String.newEmptyInstance();
 
     /**
-     * optional string signature = 4;
+     * optional string signature = 14;
      */
     private final Utf8String signature = Utf8String.newEmptyInstance();
 
     /**
-     * repeated .DisplayAvatarDetailInfo display_avatar_list = 8;
+     * repeated .DisplayAvatarDetailInfo display_avatar_list = 11;
      */
     private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo.getFactory());
 
     /**
-     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854;
+     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1700;
      */
     private final RepeatedMessage assistAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo.getFactory());
 
@@ -89,6 +93,10 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
+     * 
+     *  TODO: verify DisplayAvatarDetailInfo repeateds
+     * 

+     *
      * @return a new empty instance of {@code PlayerDetailInfo}
      */
     public static PlayerDetailInfo newInstance() {
@@ -96,7 +104,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 world_level = 6;
+     * optional uint32 world_level = 5;
      * @return whether the worldLevel field is set
      */
     public boolean hasWorldLevel() {
@@ -104,7 +112,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 world_level = 6;
+     * optional uint32 world_level = 5;
      * @return this
      */
     public PlayerDetailInfo clearWorldLevel() {
@@ -114,7 +122,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 world_level = 6;
+     * optional uint32 world_level = 5;
      * @return the worldLevel
      */
     public int getWorldLevel() {
@@ -122,7 +130,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 world_level = 6;
+     * optional uint32 world_level = 5;
      * @param value the worldLevel to set
      * @return this
      */
@@ -133,62 +141,25 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 uid = 9;
-     * @return whether the uid field is set
+     * optional uint32 head_icon = 8;
+     * @return whether the headIcon field is set
      */
-    public boolean hasUid() {
+    public boolean hasHeadIcon() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * optional uint32 uid = 9;
-     * @return this
-     */
-    public PlayerDetailInfo clearUid() {
-      bitField0_ &= ~0x00000002;
-      uid = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 uid = 9;
-     * @return the uid
-     */
-    public int getUid() {
-      return uid;
-    }
-
-    /**
-     * optional uint32 uid = 9;
-     * @param value the uid to set
-     * @return this
-     */
-    public PlayerDetailInfo setUid(final int value) {
-      bitField0_ |= 0x00000002;
-      uid = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 head_icon = 12;
-     * @return whether the headIcon field is set
-     */
-    public boolean hasHeadIcon() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * optional uint32 head_icon = 12;
+     * optional uint32 head_icon = 8;
      * @return this
      */
     public PlayerDetailInfo clearHeadIcon() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       headIcon = 0;
       return this;
     }
 
     /**
-     * optional uint32 head_icon = 12;
+     * optional uint32 head_icon = 8;
      * @return the headIcon
      */
     public int getHeadIcon() {
@@ -196,18 +167,55 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 head_icon = 12;
+     * optional uint32 head_icon = 8;
      * @param value the headIcon to set
      * @return this
      */
     public PlayerDetailInfo setHeadIcon(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       headIcon = value;
       return this;
     }
 
     /**
-     * optional uint32 level = 14;
+     * optional uint32 uid = 13;
+     * @return whether the uid field is set
+     */
+    public boolean hasUid() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * optional uint32 uid = 13;
+     * @return this
+     */
+    public PlayerDetailInfo clearUid() {
+      bitField0_ &= ~0x00000004;
+      uid = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 uid = 13;
+     * @return the uid
+     */
+    public int getUid() {
+      return uid;
+    }
+
+    /**
+     * optional uint32 uid = 13;
+     * @param value the uid to set
+     * @return this
+     */
+    public PlayerDetailInfo setUid(final int value) {
+      bitField0_ |= 0x00000004;
+      uid = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 level = 15;
      * @return whether the level field is set
      */
     public boolean hasLevel() {
@@ -215,7 +223,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 level = 14;
+     * optional uint32 level = 15;
      * @return this
      */
     public PlayerDetailInfo clearLevel() {
@@ -225,7 +233,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 level = 14;
+     * optional uint32 level = 15;
      * @return the level
      */
     public int getLevel() {
@@ -233,7 +241,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional uint32 level = 14;
+     * optional uint32 level = 15;
      * @param value the level to set
      * @return this
      */
@@ -244,7 +252,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlatformType platform_type = 5;
+     * optional .PlatformType platform_type = 3;
      * @return whether the platformType field is set
      */
     public boolean hasPlatformType() {
@@ -252,7 +260,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlatformType platform_type = 5;
+     * optional .PlatformType platform_type = 3;
      * @return this
      */
     public PlayerDetailInfo clearPlatformType() {
@@ -262,7 +270,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlatformType platform_type = 5;
+     * optional .PlatformType platform_type = 3;
      * @return the platformType
      */
     public PlatformTypeOuterClass.PlatformType getPlatformType() {
@@ -295,7 +303,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlatformType platform_type = 5;
+     * optional .PlatformType platform_type = 3;
      * @param value the platformType to set
      * @return this
      */
@@ -343,7 +351,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional bool is_banned = 11;
+     * optional bool is_banned = 12;
      * @return whether the isBanned field is set
      */
     public boolean hasIsBanned() {
@@ -351,7 +359,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional bool is_banned = 11;
+     * optional bool is_banned = 12;
      * @return this
      */
     public PlayerDetailInfo clearIsBanned() {
@@ -361,7 +369,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional bool is_banned = 11;
+     * optional bool is_banned = 12;
      * @return the isBanned
      */
     public boolean getIsBanned() {
@@ -369,7 +377,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional bool is_banned = 11;
+     * optional bool is_banned = 12;
      * @param value the isBanned to set
      * @return this
      */
@@ -380,7 +388,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerRecordInfo record_info = 13;
+     * optional .PlayerRecordInfo record_info = 7;
      * @return whether the recordInfo field is set
      */
     public boolean hasRecordInfo() {
@@ -388,7 +396,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerRecordInfo record_info = 13;
+     * optional .PlayerRecordInfo record_info = 7;
      * @return this
      */
     public PlayerDetailInfo clearRecordInfo() {
@@ -398,7 +406,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerRecordInfo record_info = 13;
+     * optional .PlayerRecordInfo record_info = 7;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -412,7 +420,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerRecordInfo record_info = 13;
+     * optional .PlayerRecordInfo record_info = 7;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -426,7 +434,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerRecordInfo record_info = 13;
+     * optional .PlayerRecordInfo record_info = 7;
      * @param value the recordInfo to set
      * @return this
      */
@@ -437,7 +445,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerDisplaySettings display_settings = 1265;
+     * optional .PlayerDisplaySettings display_settings = 1743;
      * @return whether the displaySettings field is set
      */
     public boolean hasDisplaySettings() {
@@ -445,7 +453,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerDisplaySettings display_settings = 1265;
+     * optional .PlayerDisplaySettings display_settings = 1743;
      * @return this
      */
     public PlayerDetailInfo clearDisplaySettings() {
@@ -455,7 +463,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerDisplaySettings display_settings = 1265;
+     * optional .PlayerDisplaySettings display_settings = 1743;
      *
      * This 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 +477,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerDisplaySettings display_settings = 1265;
+     * optional .PlayerDisplaySettings display_settings = 1743;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -483,7 +491,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional .PlayerDisplaySettings display_settings = 1265;
+     * optional .PlayerDisplaySettings display_settings = 1743;
      * @param value the displaySettings to set
      * @return this
      */
@@ -495,7 +503,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string nickname = 2;
+     * optional string nickname = 4;
      * @return whether the nickname field is set
      */
     public boolean hasNickname() {
@@ -503,7 +511,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string nickname = 2;
+     * optional string nickname = 4;
      * @return this
      */
     public PlayerDetailInfo clearNickname() {
@@ -513,7 +521,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string nickname = 2;
+     * optional string nickname = 4;
      * @return the nickname
      */
     public String getNickname() {
@@ -521,7 +529,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string nickname = 2;
+     * optional string nickname = 4;
      * @return internal {@code Utf8String} representation of nickname for reading
      */
     public Utf8String getNicknameBytes() {
@@ -529,7 +537,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string nickname = 2;
+     * optional string nickname = 4;
      * @return internal {@code Utf8String} representation of nickname for modifications
      */
     public Utf8String getMutableNicknameBytes() {
@@ -538,7 +546,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string nickname = 2;
+     * optional string nickname = 4;
      * @param value the nickname to set
      * @return this
      */
@@ -549,7 +557,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string nickname = 2;
+     * optional string nickname = 4;
      * @param value the nickname to set
      * @return this
      */
@@ -560,7 +568,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string signature = 4;
+     * optional string signature = 14;
      * @return whether the signature field is set
      */
     public boolean hasSignature() {
@@ -568,7 +576,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string signature = 4;
+     * optional string signature = 14;
      * @return this
      */
     public PlayerDetailInfo clearSignature() {
@@ -578,7 +586,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string signature = 4;
+     * optional string signature = 14;
      * @return the signature
      */
     public String getSignature() {
@@ -586,7 +594,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string signature = 4;
+     * optional string signature = 14;
      * @return internal {@code Utf8String} representation of signature for reading
      */
     public Utf8String getSignatureBytes() {
@@ -594,7 +602,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string signature = 4;
+     * optional string signature = 14;
      * @return internal {@code Utf8String} representation of signature for modifications
      */
     public Utf8String getMutableSignatureBytes() {
@@ -603,7 +611,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string signature = 4;
+     * optional string signature = 14;
      * @param value the signature to set
      * @return this
      */
@@ -614,7 +622,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * optional string signature = 4;
+     * optional string signature = 14;
      * @param value the signature to set
      * @return this
      */
@@ -625,7 +633,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo display_avatar_list = 8;
+     * repeated .DisplayAvatarDetailInfo display_avatar_list = 11;
      * @return whether the displayAvatarList field is set
      */
     public boolean hasDisplayAvatarList() {
@@ -633,7 +641,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo display_avatar_list = 8;
+     * repeated .DisplayAvatarDetailInfo display_avatar_list = 11;
      * @return this
      */
     public PlayerDetailInfo clearDisplayAvatarList() {
@@ -643,7 +651,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo display_avatar_list = 8;
+     * repeated .DisplayAvatarDetailInfo 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.
@@ -658,7 +666,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo display_avatar_list = 8;
+     * repeated .DisplayAvatarDetailInfo 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
@@ -673,7 +681,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo display_avatar_list = 8;
+     * repeated .DisplayAvatarDetailInfo display_avatar_list = 11;
      * @param value the displayAvatarList to add
      * @return this
      */
@@ -685,7 +693,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo display_avatar_list = 8;
+     * repeated .DisplayAvatarDetailInfo display_avatar_list = 11;
      * @param values the displayAvatarList to add
      * @return this
      */
@@ -697,7 +705,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854;
+     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1700;
      * @return whether the assistAvatarList field is set
      */
     public boolean hasAssistAvatarList() {
@@ -705,7 +713,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854;
+     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1700;
      * @return this
      */
     public PlayerDetailInfo clearAssistAvatarList() {
@@ -715,7 +723,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854;
+     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1700;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -730,7 +738,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854;
+     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1700;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -745,7 +753,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854;
+     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1700;
      * @param value the assistAvatarList to add
      * @return this
      */
@@ -757,7 +765,7 @@ public final class PlayerDetailInfoOuterClass {
     }
 
     /**
-     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854;
+     * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1700;
      * @param values the assistAvatarList to add
      * @return this
      */
@@ -774,8 +782,8 @@ public final class PlayerDetailInfoOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         worldLevel = other.worldLevel;
-        uid = other.uid;
         headIcon = other.headIcon;
+        uid = other.uid;
         level = other.level;
         platformType = other.platformType;
         showDisplayAvatars = other.showDisplayAvatars;
@@ -799,12 +807,12 @@ public final class PlayerDetailInfoOuterClass {
       if (other.hasWorldLevel()) {
         setWorldLevel(other.worldLevel);
       }
-      if (other.hasUid()) {
-        setUid(other.uid);
-      }
       if (other.hasHeadIcon()) {
         setHeadIcon(other.headIcon);
       }
+      if (other.hasUid()) {
+        setUid(other.uid);
+      }
       if (other.hasLevel()) {
         setLevel(other.level);
       }
@@ -846,8 +854,8 @@ public final class PlayerDetailInfoOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       worldLevel = 0;
-      uid = 0;
       headIcon = 0;
+      uid = 0;
       level = 0;
       platformType = 0;
       showDisplayAvatars = false;
@@ -888,8 +896,8 @@ public final class PlayerDetailInfoOuterClass {
       PlayerDetailInfo other = (PlayerDetailInfo) o;
       return bitField0_ == other.bitField0_
         && (!hasWorldLevel() || worldLevel == other.worldLevel)
-        && (!hasUid() || uid == other.uid)
         && (!hasHeadIcon() || headIcon == other.headIcon)
+        && (!hasUid() || uid == other.uid)
         && (!hasLevel() || level == other.level)
         && (!hasPlatformType() || platformType == other.platformType)
         && (!hasShowDisplayAvatars() || showDisplayAvatars == other.showDisplayAvatars)
@@ -905,23 +913,23 @@ public final class PlayerDetailInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 48);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(worldLevel);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(uid);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(headIcon);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(uid);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 112);
+        output.writeRawByte((byte) 120);
         output.writeUInt32NoTag(level);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 24);
         output.writeEnumNoTag(platformType);
       }
       if ((bitField0_ & 0x00000020) != 0) {
@@ -929,34 +937,34 @@ public final class PlayerDetailInfoOuterClass {
         output.writeBoolNoTag(showDisplayAvatars);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 96);
         output.writeBoolNoTag(isBanned);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        output.writeRawByte((byte) 106);
+        output.writeRawByte((byte) 58);
         output.writeMessageNoTag(recordInfo);
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        output.writeRawLittleEndian16((short) 20362);
+        output.writeRawLittleEndian16((short) 27898);
         output.writeMessageNoTag(displaySettings);
       }
       if ((bitField0_ & 0x00000200) != 0) {
-        output.writeRawByte((byte) 18);
+        output.writeRawByte((byte) 34);
         output.writeStringNoTag(nickname);
       }
       if ((bitField0_ & 0x00000400) != 0) {
-        output.writeRawByte((byte) 34);
+        output.writeRawByte((byte) 114);
         output.writeStringNoTag(signature);
       }
       if ((bitField0_ & 0x00000800) != 0) {
         for (int i = 0; i < displayAvatarList.length(); i++) {
-          output.writeRawByte((byte) 66);
+          output.writeRawByte((byte) 90);
           output.writeMessageNoTag(displayAvatarList.get(i));
         }
       }
       if ((bitField0_ & 0x00001000) != 0) {
         for (int i = 0; i < assistAvatarList.length(); i++) {
-          output.writeRawLittleEndian16((short) 29682);
+          output.writeRawLittleEndian16((short) 27298);
           output.writeMessageNoTag(assistAvatarList.get(i));
         }
       }
@@ -969,10 +977,10 @@ public final class PlayerDetailInfoOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(uid);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(uid);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
@@ -1014,43 +1022,43 @@ public final class PlayerDetailInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
+          case 40: {
             // worldLevel
             worldLevel = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 72) {
+            if (tag != 64) {
               break;
             }
           }
-          case 72: {
-            // uid
-            uid = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 96) {
-              break;
-            }
-          }
-          case 96: {
+          case 64: {
             // headIcon
             headIcon = input.readUInt32();
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 112) {
+            if (tag != 104) {
               break;
             }
           }
-          case 112: {
+          case 104: {
+            // uid
+            uid = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 120) {
+              break;
+            }
+          }
+          case 120: {
             // level
             level = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 40) {
+            if (tag != 24) {
               break;
             }
           }
-          case 40: {
+          case 24: {
             // platformType
             final int value = input.readInt32();
             if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) {
@@ -1067,64 +1075,64 @@ public final class PlayerDetailInfoOuterClass {
             showDisplayAvatars = input.readBool();
             bitField0_ |= 0x00000020;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 96) {
               break;
             }
           }
-          case 88: {
+          case 96: {
             // isBanned
             isBanned = input.readBool();
             bitField0_ |= 0x00000040;
             tag = input.readTag();
-            if (tag != 106) {
+            if (tag != 58) {
               break;
             }
           }
-          case 106: {
+          case 58: {
             // recordInfo
             input.readMessage(recordInfo);
             bitField0_ |= 0x00000080;
             tag = input.readTag();
-            if (tag != 10122) {
+            if (tag != 13946) {
               break;
             }
           }
-          case 10122: {
+          case 13946: {
             // displaySettings
             input.readMessage(displaySettings);
             bitField0_ |= 0x00000100;
             tag = input.readTag();
-            if (tag != 18) {
-              break;
-            }
-          }
-          case 18: {
-            // nickname
-            input.readString(nickname);
-            bitField0_ |= 0x00000200;
-            tag = input.readTag();
             if (tag != 34) {
               break;
             }
           }
           case 34: {
+            // nickname
+            input.readString(nickname);
+            bitField0_ |= 0x00000200;
+            tag = input.readTag();
+            if (tag != 114) {
+              break;
+            }
+          }
+          case 114: {
             // signature
             input.readString(signature);
             bitField0_ |= 0x00000400;
             tag = input.readTag();
-            if (tag != 66) {
+            if (tag != 90) {
               break;
             }
           }
-          case 66: {
+          case 90: {
             // displayAvatarList
             tag = input.readRepeatedMessage(displayAvatarList, tag);
             bitField0_ |= 0x00000800;
-            if (tag != 14834) {
+            if (tag != 13602) {
               break;
             }
           }
-          case 14834: {
+          case 13602: {
             // assistAvatarList
             tag = input.readRepeatedMessage(assistAvatarList, tag);
             bitField0_ |= 0x00001000;
@@ -1153,10 +1161,10 @@ public final class PlayerDetailInfoOuterClass {
         output.writeUInt32(FieldNames.worldLevel, worldLevel);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.uid, uid);
+        output.writeUInt32(FieldNames.headIcon, headIcon);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.headIcon, headIcon);
+        output.writeUInt32(FieldNames.uid, uid);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeUInt32(FieldNames.level, level);
@@ -1210,10 +1218,11 @@ public final class PlayerDetailInfoOuterClass {
             }
             break;
           }
-          case 115792: {
-            if (input.isAtField(FieldNames.uid)) {
+          case -1116107143:
+          case -219098248: {
+            if (input.isAtField(FieldNames.headIcon)) {
               if (!input.trySkipNullValue()) {
-                uid = input.readUInt32();
+                headIcon = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -1221,11 +1230,10 @@ public final class PlayerDetailInfoOuterClass {
             }
             break;
           }
-          case -1116107143:
-          case -219098248: {
-            if (input.isAtField(FieldNames.headIcon)) {
+          case 115792: {
+            if (input.isAtField(FieldNames.uid)) {
               if (!input.trySkipNullValue()) {
-                headIcon = input.readUInt32();
+                uid = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -1410,10 +1418,10 @@ public final class PlayerDetailInfoOuterClass {
     static class FieldNames {
       static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
 
-      static final FieldName uid = FieldName.forField("uid");
-
       static final FieldName headIcon = FieldName.forField("headIcon", "head_icon");
 
+      static final FieldName uid = FieldName.forField("uid");
+
       static final FieldName level = FieldName.forField("level");
 
       static final FieldName platformType = FieldName.forField("platformType", "platform_type");
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java
index 3c6c319..4080364 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java
@@ -19,34 +19,29 @@ public final class PlayerDisplaySettingsOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional .DisplayRecordType EPMCKMCDIGB = 15;
+     * optional bool GGODAIOHJIF = 2;
      */
-    private int ePMCKMCDIGB;
+    private boolean gGODAIOHJIF;
 
     /**
-     * optional bool DKLJGCEHPJL = 5;
+     * optional bool HHCGDEOCOMI = 3;
      */
-    private boolean dKLJGCEHPJL;
+    private boolean hHCGDEOCOMI;
 
     /**
-     * optional bool BPELFJGIJID = 7;
+     * optional bool BKPACECKIIA = 6;
      */
-    private boolean bPELFJGIJID;
+    private boolean bKPACECKIIA;
 
     /**
-     * optional bool DAFHJJEDMOF = 8;
+     * optional bool KMJDMEFGCCK = 13;
      */
-    private boolean dAFHJJEDMOF;
+    private boolean kMJDMEFGCCK;
 
     /**
-     * optional bool KDAKDMCGFND = 11;
+     * optional bool JCNINCCCAKL = 14;
      */
-    private boolean kDAKDMCGFND;
-
-    /**
-     * optional bool KEACGBKOFKF = 13;
-     */
-    private boolean kEACGBKOFKF;
+    private boolean jCNINCCCAKL;
 
     private PlayerDisplaySettings() {
     }
@@ -59,250 +54,187 @@ public final class PlayerDisplaySettingsOuterClass {
     }
 
     /**
-     * optional .DisplayRecordType EPMCKMCDIGB = 15;
-     * @return whether the ePMCKMCDIGB field is set
+     * optional bool GGODAIOHJIF = 2;
+     * @return whether the gGODAIOHJIF field is set
      */
-    public boolean hasEPMCKMCDIGB() {
+    public boolean hasGGODAIOHJIF() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional .DisplayRecordType EPMCKMCDIGB = 15;
+     * optional bool GGODAIOHJIF = 2;
      * @return this
      */
-    public PlayerDisplaySettings clearEPMCKMCDIGB() {
+    public PlayerDisplaySettings clearGGODAIOHJIF() {
       bitField0_ &= ~0x00000001;
-      ePMCKMCDIGB = 0;
+      gGODAIOHJIF = false;
       return this;
     }
 
     /**
-     * optional .DisplayRecordType EPMCKMCDIGB = 15;
-     * @return the ePMCKMCDIGB
+     * optional bool GGODAIOHJIF = 2;
+     * @return the gGODAIOHJIF
      */
-    public DisplayRecordTypeOuterClass.DisplayRecordType getEPMCKMCDIGB() {
-      return DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(ePMCKMCDIGB);
+    public boolean getGGODAIOHJIF() {
+      return gGODAIOHJIF;
     }
 
     /**
-     * Gets the value of the internal enum store. The result is
-     * equivalent to {@link PlayerDisplaySettings#getEPMCKMCDIGB()}.getNumber().
-     *
-     * @return numeric wire representation
-     */
-    public int getEPMCKMCDIGBValue() {
-      return ePMCKMCDIGB;
-    }
-
-    /**
-     * Sets the value of the internal enum store. This does not
-     * do any validity checks, so be sure to use appropriate value
-     * constants from {@link DisplayRecordTypeOuterClass.DisplayRecordType}. Setting an invalid value
-     * can cause {@link PlayerDisplaySettings#getEPMCKMCDIGB()} to return null
-     *
-     * @param value the numeric wire value to set
+     * optional bool GGODAIOHJIF = 2;
+     * @param value the gGODAIOHJIF to set
      * @return this
      */
-    public PlayerDisplaySettings setEPMCKMCDIGBValue(final int value) {
+    public PlayerDisplaySettings setGGODAIOHJIF(final boolean value) {
       bitField0_ |= 0x00000001;
-      ePMCKMCDIGB = value;
+      gGODAIOHJIF = value;
       return this;
     }
 
     /**
-     * optional .DisplayRecordType EPMCKMCDIGB = 15;
-     * @param value the ePMCKMCDIGB to set
-     * @return this
+     * optional bool HHCGDEOCOMI = 3;
+     * @return whether the hHCGDEOCOMI field is set
      */
-    public PlayerDisplaySettings setEPMCKMCDIGB(
-        final DisplayRecordTypeOuterClass.DisplayRecordType value) {
-      bitField0_ |= 0x00000001;
-      ePMCKMCDIGB = value.getNumber();
-      return this;
-    }
-
-    /**
-     * optional bool DKLJGCEHPJL = 5;
-     * @return whether the dKLJGCEHPJL field is set
-     */
-    public boolean hasDKLJGCEHPJL() {
+    public boolean hasHHCGDEOCOMI() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * optional bool DKLJGCEHPJL = 5;
+     * optional bool HHCGDEOCOMI = 3;
      * @return this
      */
-    public PlayerDisplaySettings clearDKLJGCEHPJL() {
+    public PlayerDisplaySettings clearHHCGDEOCOMI() {
       bitField0_ &= ~0x00000002;
-      dKLJGCEHPJL = false;
+      hHCGDEOCOMI = false;
       return this;
     }
 
     /**
-     * optional bool DKLJGCEHPJL = 5;
-     * @return the dKLJGCEHPJL
+     * optional bool HHCGDEOCOMI = 3;
+     * @return the hHCGDEOCOMI
      */
-    public boolean getDKLJGCEHPJL() {
-      return dKLJGCEHPJL;
+    public boolean getHHCGDEOCOMI() {
+      return hHCGDEOCOMI;
     }
 
     /**
-     * optional bool DKLJGCEHPJL = 5;
-     * @param value the dKLJGCEHPJL to set
+     * optional bool HHCGDEOCOMI = 3;
+     * @param value the hHCGDEOCOMI to set
      * @return this
      */
-    public PlayerDisplaySettings setDKLJGCEHPJL(final boolean value) {
+    public PlayerDisplaySettings setHHCGDEOCOMI(final boolean value) {
       bitField0_ |= 0x00000002;
-      dKLJGCEHPJL = value;
+      hHCGDEOCOMI = value;
       return this;
     }
 
     /**
-     * optional bool BPELFJGIJID = 7;
-     * @return whether the bPELFJGIJID field is set
+     * optional bool BKPACECKIIA = 6;
+     * @return whether the bKPACECKIIA field is set
      */
-    public boolean hasBPELFJGIJID() {
+    public boolean hasBKPACECKIIA() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional bool BPELFJGIJID = 7;
+     * optional bool BKPACECKIIA = 6;
      * @return this
      */
-    public PlayerDisplaySettings clearBPELFJGIJID() {
+    public PlayerDisplaySettings clearBKPACECKIIA() {
       bitField0_ &= ~0x00000004;
-      bPELFJGIJID = false;
+      bKPACECKIIA = false;
       return this;
     }
 
     /**
-     * optional bool BPELFJGIJID = 7;
-     * @return the bPELFJGIJID
+     * optional bool BKPACECKIIA = 6;
+     * @return the bKPACECKIIA
      */
-    public boolean getBPELFJGIJID() {
-      return bPELFJGIJID;
+    public boolean getBKPACECKIIA() {
+      return bKPACECKIIA;
     }
 
     /**
-     * optional bool BPELFJGIJID = 7;
-     * @param value the bPELFJGIJID to set
+     * optional bool BKPACECKIIA = 6;
+     * @param value the bKPACECKIIA to set
      * @return this
      */
-    public PlayerDisplaySettings setBPELFJGIJID(final boolean value) {
+    public PlayerDisplaySettings setBKPACECKIIA(final boolean value) {
       bitField0_ |= 0x00000004;
-      bPELFJGIJID = value;
+      bKPACECKIIA = value;
       return this;
     }
 
     /**
-     * optional bool DAFHJJEDMOF = 8;
-     * @return whether the dAFHJJEDMOF field is set
+     * optional bool KMJDMEFGCCK = 13;
+     * @return whether the kMJDMEFGCCK field is set
      */
-    public boolean hasDAFHJJEDMOF() {
+    public boolean hasKMJDMEFGCCK() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * optional bool DAFHJJEDMOF = 8;
+     * optional bool KMJDMEFGCCK = 13;
      * @return this
      */
-    public PlayerDisplaySettings clearDAFHJJEDMOF() {
+    public PlayerDisplaySettings clearKMJDMEFGCCK() {
       bitField0_ &= ~0x00000008;
-      dAFHJJEDMOF = false;
+      kMJDMEFGCCK = false;
       return this;
     }
 
     /**
-     * optional bool DAFHJJEDMOF = 8;
-     * @return the dAFHJJEDMOF
+     * optional bool KMJDMEFGCCK = 13;
+     * @return the kMJDMEFGCCK
      */
-    public boolean getDAFHJJEDMOF() {
-      return dAFHJJEDMOF;
+    public boolean getKMJDMEFGCCK() {
+      return kMJDMEFGCCK;
     }
 
     /**
-     * optional bool DAFHJJEDMOF = 8;
-     * @param value the dAFHJJEDMOF to set
+     * optional bool KMJDMEFGCCK = 13;
+     * @param value the kMJDMEFGCCK to set
      * @return this
      */
-    public PlayerDisplaySettings setDAFHJJEDMOF(final boolean value) {
+    public PlayerDisplaySettings setKMJDMEFGCCK(final boolean value) {
       bitField0_ |= 0x00000008;
-      dAFHJJEDMOF = value;
+      kMJDMEFGCCK = value;
       return this;
     }
 
     /**
-     * optional bool KDAKDMCGFND = 11;
-     * @return whether the kDAKDMCGFND field is set
+     * optional bool JCNINCCCAKL = 14;
+     * @return whether the jCNINCCCAKL field is set
      */
-    public boolean hasKDAKDMCGFND() {
+    public boolean hasJCNINCCCAKL() {
       return (bitField0_ & 0x00000010) != 0;
     }
 
     /**
-     * optional bool KDAKDMCGFND = 11;
+     * optional bool JCNINCCCAKL = 14;
      * @return this
      */
-    public PlayerDisplaySettings clearKDAKDMCGFND() {
+    public PlayerDisplaySettings clearJCNINCCCAKL() {
       bitField0_ &= ~0x00000010;
-      kDAKDMCGFND = false;
+      jCNINCCCAKL = false;
       return this;
     }
 
     /**
-     * optional bool KDAKDMCGFND = 11;
-     * @return the kDAKDMCGFND
+     * optional bool JCNINCCCAKL = 14;
+     * @return the jCNINCCCAKL
      */
-    public boolean getKDAKDMCGFND() {
-      return kDAKDMCGFND;
+    public boolean getJCNINCCCAKL() {
+      return jCNINCCCAKL;
     }
 
     /**
-     * optional bool KDAKDMCGFND = 11;
-     * @param value the kDAKDMCGFND to set
+     * optional bool JCNINCCCAKL = 14;
+     * @param value the jCNINCCCAKL to set
      * @return this
      */
-    public PlayerDisplaySettings setKDAKDMCGFND(final boolean value) {
+    public PlayerDisplaySettings setJCNINCCCAKL(final boolean value) {
       bitField0_ |= 0x00000010;
-      kDAKDMCGFND = value;
-      return this;
-    }
-
-    /**
-     * optional bool KEACGBKOFKF = 13;
-     * @return whether the kEACGBKOFKF field is set
-     */
-    public boolean hasKEACGBKOFKF() {
-      return (bitField0_ & 0x00000020) != 0;
-    }
-
-    /**
-     * optional bool KEACGBKOFKF = 13;
-     * @return this
-     */
-    public PlayerDisplaySettings clearKEACGBKOFKF() {
-      bitField0_ &= ~0x00000020;
-      kEACGBKOFKF = false;
-      return this;
-    }
-
-    /**
-     * optional bool KEACGBKOFKF = 13;
-     * @return the kEACGBKOFKF
-     */
-    public boolean getKEACGBKOFKF() {
-      return kEACGBKOFKF;
-    }
-
-    /**
-     * optional bool KEACGBKOFKF = 13;
-     * @param value the kEACGBKOFKF to set
-     * @return this
-     */
-    public PlayerDisplaySettings setKEACGBKOFKF(final boolean value) {
-      bitField0_ |= 0x00000020;
-      kEACGBKOFKF = value;
+      jCNINCCCAKL = value;
       return this;
     }
 
@@ -311,12 +243,11 @@ public final class PlayerDisplaySettingsOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        ePMCKMCDIGB = other.ePMCKMCDIGB;
-        dKLJGCEHPJL = other.dKLJGCEHPJL;
-        bPELFJGIJID = other.bPELFJGIJID;
-        dAFHJJEDMOF = other.dAFHJJEDMOF;
-        kDAKDMCGFND = other.kDAKDMCGFND;
-        kEACGBKOFKF = other.kEACGBKOFKF;
+        gGODAIOHJIF = other.gGODAIOHJIF;
+        hHCGDEOCOMI = other.hHCGDEOCOMI;
+        bKPACECKIIA = other.bKPACECKIIA;
+        kMJDMEFGCCK = other.kMJDMEFGCCK;
+        jCNINCCCAKL = other.jCNINCCCAKL;
       }
       return this;
     }
@@ -327,23 +258,20 @@ public final class PlayerDisplaySettingsOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasEPMCKMCDIGB()) {
-        setEPMCKMCDIGBValue(other.ePMCKMCDIGB);
+      if (other.hasGGODAIOHJIF()) {
+        setGGODAIOHJIF(other.gGODAIOHJIF);
       }
-      if (other.hasDKLJGCEHPJL()) {
-        setDKLJGCEHPJL(other.dKLJGCEHPJL);
+      if (other.hasHHCGDEOCOMI()) {
+        setHHCGDEOCOMI(other.hHCGDEOCOMI);
       }
-      if (other.hasBPELFJGIJID()) {
-        setBPELFJGIJID(other.bPELFJGIJID);
+      if (other.hasBKPACECKIIA()) {
+        setBKPACECKIIA(other.bKPACECKIIA);
       }
-      if (other.hasDAFHJJEDMOF()) {
-        setDAFHJJEDMOF(other.dAFHJJEDMOF);
+      if (other.hasKMJDMEFGCCK()) {
+        setKMJDMEFGCCK(other.kMJDMEFGCCK);
       }
-      if (other.hasKDAKDMCGFND()) {
-        setKDAKDMCGFND(other.kDAKDMCGFND);
-      }
-      if (other.hasKEACGBKOFKF()) {
-        setKEACGBKOFKF(other.kEACGBKOFKF);
+      if (other.hasJCNINCCCAKL()) {
+        setJCNINCCCAKL(other.jCNINCCCAKL);
       }
       return this;
     }
@@ -355,12 +283,11 @@ public final class PlayerDisplaySettingsOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      ePMCKMCDIGB = 0;
-      dKLJGCEHPJL = false;
-      bPELFJGIJID = false;
-      dAFHJJEDMOF = false;
-      kDAKDMCGFND = false;
-      kEACGBKOFKF = false;
+      gGODAIOHJIF = false;
+      hHCGDEOCOMI = false;
+      bKPACECKIIA = false;
+      kMJDMEFGCCK = false;
+      jCNINCCCAKL = false;
       return this;
     }
 
@@ -384,39 +311,34 @@ public final class PlayerDisplaySettingsOuterClass {
       }
       PlayerDisplaySettings other = (PlayerDisplaySettings) o;
       return bitField0_ == other.bitField0_
-        && (!hasEPMCKMCDIGB() || ePMCKMCDIGB == other.ePMCKMCDIGB)
-        && (!hasDKLJGCEHPJL() || dKLJGCEHPJL == other.dKLJGCEHPJL)
-        && (!hasBPELFJGIJID() || bPELFJGIJID == other.bPELFJGIJID)
-        && (!hasDAFHJJEDMOF() || dAFHJJEDMOF == other.dAFHJJEDMOF)
-        && (!hasKDAKDMCGFND() || kDAKDMCGFND == other.kDAKDMCGFND)
-        && (!hasKEACGBKOFKF() || kEACGBKOFKF == other.kEACGBKOFKF);
+        && (!hasGGODAIOHJIF() || gGODAIOHJIF == other.gGODAIOHJIF)
+        && (!hasHHCGDEOCOMI() || hHCGDEOCOMI == other.hHCGDEOCOMI)
+        && (!hasBKPACECKIIA() || bKPACECKIIA == other.bKPACECKIIA)
+        && (!hasKMJDMEFGCCK() || kMJDMEFGCCK == other.kMJDMEFGCCK)
+        && (!hasJCNINCCCAKL() || jCNINCCCAKL == other.jCNINCCCAKL);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 120);
-        output.writeEnumNoTag(ePMCKMCDIGB);
+        output.writeRawByte((byte) 16);
+        output.writeBoolNoTag(gGODAIOHJIF);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeBoolNoTag(dKLJGCEHPJL);
+        output.writeRawByte((byte) 24);
+        output.writeBoolNoTag(hHCGDEOCOMI);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeBoolNoTag(bPELFJGIJID);
+        output.writeRawByte((byte) 48);
+        output.writeBoolNoTag(bKPACECKIIA);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 64);
-        output.writeBoolNoTag(dAFHJJEDMOF);
+        output.writeRawByte((byte) 104);
+        output.writeBoolNoTag(kMJDMEFGCCK);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 88);
-        output.writeBoolNoTag(kDAKDMCGFND);
-      }
-      if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 104);
-        output.writeBoolNoTag(kEACGBKOFKF);
+        output.writeRawByte((byte) 112);
+        output.writeBoolNoTag(jCNINCCCAKL);
       }
     }
 
@@ -424,7 +346,7 @@ public final class PlayerDisplaySettingsOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeEnumSizeNoTag(ePMCKMCDIGB);
+        size += 2;
       }
       if ((bitField0_ & 0x00000002) != 0) {
         size += 2;
@@ -438,9 +360,6 @@ public final class PlayerDisplaySettingsOuterClass {
       if ((bitField0_ & 0x00000010) != 0) {
         size += 2;
       }
-      if ((bitField0_ & 0x00000020) != 0) {
-        size += 2;
-      }
       return size;
     }
 
@@ -451,58 +370,46 @@ public final class PlayerDisplaySettingsOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 120: {
-            // ePMCKMCDIGB
-            final int value = input.readInt32();
-            if (DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(value) != null) {
-              ePMCKMCDIGB = value;
-              bitField0_ |= 0x00000001;
-            }
+          case 16: {
+            // gGODAIOHJIF
+            gGODAIOHJIF = input.readBool();
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 40) {
+            if (tag != 24) {
               break;
             }
           }
-          case 40: {
-            // dKLJGCEHPJL
-            dKLJGCEHPJL = input.readBool();
+          case 24: {
+            // hHCGDEOCOMI
+            hHCGDEOCOMI = input.readBool();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 48) {
               break;
             }
           }
-          case 56: {
-            // bPELFJGIJID
-            bPELFJGIJID = input.readBool();
+          case 48: {
+            // bKPACECKIIA
+            bKPACECKIIA = input.readBool();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 64) {
-              break;
-            }
-          }
-          case 64: {
-            // dAFHJJEDMOF
-            dAFHJJEDMOF = input.readBool();
-            bitField0_ |= 0x00000008;
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
-            // kDAKDMCGFND
-            kDAKDMCGFND = input.readBool();
-            bitField0_ |= 0x00000010;
-            tag = input.readTag();
             if (tag != 104) {
               break;
             }
           }
           case 104: {
-            // kEACGBKOFKF
-            kEACGBKOFKF = input.readBool();
-            bitField0_ |= 0x00000020;
+            // kMJDMEFGCCK
+            kMJDMEFGCCK = input.readBool();
+            bitField0_ |= 0x00000008;
+            tag = input.readTag();
+            if (tag != 112) {
+              break;
+            }
+          }
+          case 112: {
+            // jCNINCCCAKL
+            jCNINCCCAKL = input.readBool();
+            bitField0_ |= 0x00000010;
             tag = input.readTag();
             if (tag != 0) {
               break;
@@ -526,22 +433,19 @@ public final class PlayerDisplaySettingsOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeEnum(FieldNames.ePMCKMCDIGB, ePMCKMCDIGB, DisplayRecordTypeOuterClass.DisplayRecordType.converter());
+        output.writeBool(FieldNames.gGODAIOHJIF, gGODAIOHJIF);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeBool(FieldNames.dKLJGCEHPJL, dKLJGCEHPJL);
+        output.writeBool(FieldNames.hHCGDEOCOMI, hHCGDEOCOMI);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeBool(FieldNames.bPELFJGIJID, bPELFJGIJID);
+        output.writeBool(FieldNames.bKPACECKIIA, bKPACECKIIA);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeBool(FieldNames.dAFHJJEDMOF, dAFHJJEDMOF);
+        output.writeBool(FieldNames.kMJDMEFGCCK, kMJDMEFGCCK);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeBool(FieldNames.kDAKDMCGFND, kDAKDMCGFND);
-      }
-      if ((bitField0_ & 0x00000020) != 0) {
-        output.writeBool(FieldNames.kEACGBKOFKF, kEACGBKOFKF);
+        output.writeBool(FieldNames.jCNINCCCAKL, jCNINCCCAKL);
       }
       output.endObject();
     }
@@ -553,26 +457,21 @@ public final class PlayerDisplaySettingsOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1204049952: {
-            if (input.isAtField(FieldNames.ePMCKMCDIGB)) {
+          case 1413221105: {
+            if (input.isAtField(FieldNames.gGODAIOHJIF)) {
               if (!input.trySkipNullValue()) {
-                final DisplayRecordTypeOuterClass.DisplayRecordType value = input.readEnum(DisplayRecordTypeOuterClass.DisplayRecordType.converter());
-                if (value != null) {
-                  ePMCKMCDIGB = value.getNumber();
-                  bitField0_ |= 0x00000001;
-                } else {
-                  input.skipUnknownEnumValue();
-                }
+                gGODAIOHJIF = input.readBool();
+                bitField0_ |= 0x00000001;
               }
             } else {
               input.skipUnknownField();
             }
             break;
           }
-          case 1271460558: {
-            if (input.isAtField(FieldNames.dKLJGCEHPJL)) {
+          case -1179279854: {
+            if (input.isAtField(FieldNames.hHCGDEOCOMI)) {
               if (!input.trySkipNullValue()) {
-                dKLJGCEHPJL = input.readBool();
+                hHCGDEOCOMI = input.readBool();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -580,10 +479,10 @@ public final class PlayerDisplaySettingsOuterClass {
             }
             break;
           }
-          case -2139467414: {
-            if (input.isAtField(FieldNames.bPELFJGIJID)) {
+          case -69431971: {
+            if (input.isAtField(FieldNames.bKPACECKIIA)) {
               if (!input.trySkipNullValue()) {
-                bPELFJGIJID = input.readBool();
+                bKPACECKIIA = input.readBool();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -591,10 +490,10 @@ public final class PlayerDisplaySettingsOuterClass {
             }
             break;
           }
-          case 573593030: {
-            if (input.isAtField(FieldNames.dAFHJJEDMOF)) {
+          case -274115754: {
+            if (input.isAtField(FieldNames.kMJDMEFGCCK)) {
               if (!input.trySkipNullValue()) {
-                dAFHJJEDMOF = input.readBool();
+                kMJDMEFGCCK = input.readBool();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -602,10 +501,10 @@ public final class PlayerDisplaySettingsOuterClass {
             }
             break;
           }
-          case 725164556: {
-            if (input.isAtField(FieldNames.kDAKDMCGFND)) {
+          case 1504591161: {
+            if (input.isAtField(FieldNames.jCNINCCCAKL)) {
               if (!input.trySkipNullValue()) {
-                kDAKDMCGFND = input.readBool();
+                jCNINCCCAKL = input.readBool();
                 bitField0_ |= 0x00000010;
               }
             } else {
@@ -613,17 +512,6 @@ public final class PlayerDisplaySettingsOuterClass {
             }
             break;
           }
-          case 1826287046: {
-            if (input.isAtField(FieldNames.kEACGBKOFKF)) {
-              if (!input.trySkipNullValue()) {
-                kEACGBKOFKF = input.readBool();
-                bitField0_ |= 0x00000020;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           default: {
             input.skipUnknownField();
             break;
@@ -677,17 +565,15 @@ public final class PlayerDisplaySettingsOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName ePMCKMCDIGB = FieldName.forField("EPMCKMCDIGB");
+      static final FieldName gGODAIOHJIF = FieldName.forField("GGODAIOHJIF");
 
-      static final FieldName dKLJGCEHPJL = FieldName.forField("DKLJGCEHPJL");
+      static final FieldName hHCGDEOCOMI = FieldName.forField("HHCGDEOCOMI");
 
-      static final FieldName bPELFJGIJID = FieldName.forField("BPELFJGIJID");
+      static final FieldName bKPACECKIIA = FieldName.forField("BKPACECKIIA");
 
-      static final FieldName dAFHJJEDMOF = FieldName.forField("DAFHJJEDMOF");
+      static final FieldName kMJDMEFGCCK = FieldName.forField("KMJDMEFGCCK");
 
-      static final FieldName kDAKDMCGFND = FieldName.forField("KDAKDMCGFND");
-
-      static final FieldName kEACGBKOFKF = FieldName.forField("KEACGBKOFKF");
+      static final FieldName jCNINCCCAKL = FieldName.forField("JCNINCCCAKL");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java
index 78b00b7..227281c 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java
@@ -20,17 +20,17 @@ public final class PlayerGetTokenCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 platform_type = 15;
+     * optional uint32 platform_type = 3;
      */
     private int platformType;
 
     /**
-     * optional string token = 1;
+     * optional string token = 4;
      */
     private final Utf8String token = Utf8String.newEmptyInstance();
 
     /**
-     * optional string account_uid = 11;
+     * optional string account_uid = 10;
      */
     private final Utf8String accountUid = Utf8String.newEmptyInstance();
 
@@ -45,7 +45,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional uint32 platform_type = 15;
+     * optional uint32 platform_type = 3;
      * @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 = 3;
      * @return this
      */
     public PlayerGetTokenCsReq clearPlatformType() {
@@ -63,7 +63,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional uint32 platform_type = 15;
+     * optional uint32 platform_type = 3;
      * @return the platformType
      */
     public int getPlatformType() {
@@ -71,7 +71,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional uint32 platform_type = 15;
+     * optional uint32 platform_type = 3;
      * @param value the platformType to set
      * @return this
      */
@@ -82,7 +82,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string token = 1;
+     * optional string token = 4;
      * @return whether the token field is set
      */
     public boolean hasToken() {
@@ -90,7 +90,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string token = 1;
+     * optional string token = 4;
      * @return this
      */
     public PlayerGetTokenCsReq clearToken() {
@@ -100,7 +100,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string token = 1;
+     * optional string token = 4;
      * @return the token
      */
     public String getToken() {
@@ -108,7 +108,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string token = 1;
+     * optional string token = 4;
      * @return internal {@code Utf8String} representation of token for reading
      */
     public Utf8String getTokenBytes() {
@@ -116,7 +116,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string token = 1;
+     * optional string token = 4;
      * @return internal {@code Utf8String} representation of token for modifications
      */
     public Utf8String getMutableTokenBytes() {
@@ -125,7 +125,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string token = 1;
+     * optional string token = 4;
      * @param value the token to set
      * @return this
      */
@@ -136,7 +136,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string token = 1;
+     * optional string token = 4;
      * @param value the token to set
      * @return this
      */
@@ -147,7 +147,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string account_uid = 11;
+     * optional string account_uid = 10;
      * @return whether the accountUid field is set
      */
     public boolean hasAccountUid() {
@@ -155,7 +155,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string account_uid = 11;
+     * optional string account_uid = 10;
      * @return this
      */
     public PlayerGetTokenCsReq clearAccountUid() {
@@ -165,7 +165,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string account_uid = 11;
+     * optional string account_uid = 10;
      * @return the accountUid
      */
     public String getAccountUid() {
@@ -173,7 +173,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string account_uid = 11;
+     * optional string account_uid = 10;
      * @return internal {@code Utf8String} representation of accountUid for reading
      */
     public Utf8String getAccountUidBytes() {
@@ -181,7 +181,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string account_uid = 11;
+     * optional string account_uid = 10;
      * @return internal {@code Utf8String} representation of accountUid for modifications
      */
     public Utf8String getMutableAccountUidBytes() {
@@ -190,7 +190,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string account_uid = 11;
+     * optional string account_uid = 10;
      * @param value the accountUid to set
      * @return this
      */
@@ -201,7 +201,7 @@ public final class PlayerGetTokenCsReqOuterClass {
     }
 
     /**
-     * optional string account_uid = 11;
+     * optional string account_uid = 10;
      * @param value the accountUid to set
      * @return this
      */
@@ -284,15 +284,15 @@ public final class PlayerGetTokenCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(platformType);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 10);
+        output.writeRawByte((byte) 34);
         output.writeStringNoTag(token);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 90);
+        output.writeRawByte((byte) 82);
         output.writeStringNoTag(accountUid);
       }
     }
@@ -319,25 +319,25 @@ public final class PlayerGetTokenCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 120: {
+          case 24: {
             // platformType
             platformType = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 10) {
+            if (tag != 34) {
               break;
             }
           }
-          case 10: {
+          case 34: {
             // token
             input.readString(token);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 82) {
               break;
             }
           }
-          case 90: {
+          case 82: {
             // accountUid
             input.readString(accountUid);
             bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java
index 0dcdc7d..d263634 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 = 15;
+     * optional uint64 secret_key_seed = 5;
      */
     private long secretKeySeed;
 
     /**
-     * optional uint32 uid = 1;
+     * optional uint32 uid = 4;
      */
     private int uid;
 
     /**
-     * optional uint32 retcode = 4;
+     * optional uint32 retcode = 10;
      */
     private int retcode;
 
     /**
-     * optional .BlackInfo black_info = 5;
+     * optional .BlackInfo black_info = 12;
      */
     private final BlackInfoOuterClass.BlackInfo blackInfo = BlackInfoOuterClass.BlackInfo.newInstance();
 
     /**
-     * optional string msg = 2;
+     * optional string msg = 3;
      */
     private final Utf8String msg = Utf8String.newEmptyInstance();
 
@@ -55,7 +55,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint64 secret_key_seed = 15;
+     * optional uint64 secret_key_seed = 5;
      * @return whether the secretKeySeed field is set
      */
     public boolean hasSecretKeySeed() {
@@ -63,7 +63,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint64 secret_key_seed = 15;
+     * optional uint64 secret_key_seed = 5;
      * @return this
      */
     public PlayerGetTokenScRsp clearSecretKeySeed() {
@@ -73,7 +73,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint64 secret_key_seed = 15;
+     * optional uint64 secret_key_seed = 5;
      * @return the secretKeySeed
      */
     public long getSecretKeySeed() {
@@ -81,7 +81,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint64 secret_key_seed = 15;
+     * optional uint64 secret_key_seed = 5;
      * @param value the secretKeySeed to set
      * @return this
      */
@@ -92,7 +92,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint32 uid = 1;
+     * optional uint32 uid = 4;
      * @return whether the uid field is set
      */
     public boolean hasUid() {
@@ -100,7 +100,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint32 uid = 1;
+     * optional uint32 uid = 4;
      * @return this
      */
     public PlayerGetTokenScRsp clearUid() {
@@ -110,7 +110,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint32 uid = 1;
+     * optional uint32 uid = 4;
      * @return the uid
      */
     public int getUid() {
@@ -118,7 +118,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint32 uid = 1;
+     * optional uint32 uid = 4;
      * @param value the uid to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 4;
+     * optional uint32 retcode = 10;
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -137,7 +137,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 4;
+     * optional uint32 retcode = 10;
      * @return this
      */
     public PlayerGetTokenScRsp clearRetcode() {
@@ -147,7 +147,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 4;
+     * optional uint32 retcode = 10;
      * @return the retcode
      */
     public int getRetcode() {
@@ -155,7 +155,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 4;
+     * optional uint32 retcode = 10;
      * @param value the retcode to set
      * @return this
      */
@@ -166,7 +166,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional .BlackInfo black_info = 5;
+     * optional .BlackInfo black_info = 12;
      * @return whether the blackInfo field is set
      */
     public boolean hasBlackInfo() {
@@ -174,7 +174,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional .BlackInfo black_info = 5;
+     * optional .BlackInfo black_info = 12;
      * @return this
      */
     public PlayerGetTokenScRsp clearBlackInfo() {
@@ -184,7 +184,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional .BlackInfo black_info = 5;
+     * optional .BlackInfo black_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.
@@ -198,7 +198,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional .BlackInfo black_info = 5;
+     * optional .BlackInfo black_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
@@ -212,7 +212,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional .BlackInfo black_info = 5;
+     * optional .BlackInfo black_info = 12;
      * @param value the blackInfo to set
      * @return this
      */
@@ -223,7 +223,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional string msg = 2;
+     * optional string msg = 3;
      * @return whether the msg field is set
      */
     public boolean hasMsg() {
@@ -231,7 +231,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional string msg = 2;
+     * optional string msg = 3;
      * @return this
      */
     public PlayerGetTokenScRsp clearMsg() {
@@ -241,7 +241,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional string msg = 2;
+     * optional string msg = 3;
      * @return the msg
      */
     public String getMsg() {
@@ -249,7 +249,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional string msg = 2;
+     * optional string msg = 3;
      * @return internal {@code Utf8String} representation of msg for reading
      */
     public Utf8String getMsgBytes() {
@@ -257,7 +257,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional string msg = 2;
+     * optional string msg = 3;
      * @return internal {@code Utf8String} representation of msg for modifications
      */
     public Utf8String getMutableMsgBytes() {
@@ -266,7 +266,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional string msg = 2;
+     * optional string msg = 3;
      * @param value the msg to set
      * @return this
      */
@@ -277,7 +277,7 @@ public final class PlayerGetTokenScRspOuterClass {
     }
 
     /**
-     * optional string msg = 2;
+     * optional string msg = 3;
      * @param value the msg to set
      * @return this
      */
@@ -372,23 +372,23 @@ public final class PlayerGetTokenScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 40);
         output.writeUInt64NoTag(secretKeySeed);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(uid);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 98);
         output.writeMessageNoTag(blackInfo);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 18);
+        output.writeRawByte((byte) 26);
         output.writeStringNoTag(msg);
       }
     }
@@ -421,43 +421,43 @@ public final class PlayerGetTokenScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 120: {
+          case 40: {
             // secretKeySeed
             secretKeySeed = input.readUInt64();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 8) {
-              break;
-            }
-          }
-          case 8: {
-            // uid
-            uid = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
             if (tag != 32) {
               break;
             }
           }
           case 32: {
+            // uid
+            uid = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 80) {
+              break;
+            }
+          }
+          case 80: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 98) {
               break;
             }
           }
-          case 42: {
+          case 98: {
             // blackInfo
             input.readMessage(blackInfo);
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 18) {
+            if (tag != 26) {
               break;
             }
           }
-          case 18: {
+          case 26: {
             // msg
             input.readString(msg);
             bitField0_ |= 0x00000010;
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java
index deef22c..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 = 10;
+     * optional uint64 client_time_ms = 11;
      */
     private long clientTimeMs;
 
@@ -34,7 +34,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
     }
 
     /**
-     * optional uint64 client_time_ms = 10;
+     * 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 = 10;
+     * optional uint64 client_time_ms = 11;
      * @return this
      */
     public PlayerHeartbeatCsReq clearClientTimeMs() {
@@ -52,7 +52,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
     }
 
     /**
-     * optional uint64 client_time_ms = 10;
+     * 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 = 10;
+     * 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) 80);
+        output.writeRawByte((byte) 88);
         output.writeUInt64NoTag(clientTimeMs);
       }
     }
@@ -150,7 +150,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 80: {
+          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 ff33a1a..8fd36db 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java
@@ -24,12 +24,12 @@ public final class PlayerHeartbeatScRspOuterClass {
     private long clientTimeMs;
 
     /**
-     * optional uint64 server_time_ms = 15;
+     * optional uint64 server_time_ms = 12;
      */
     private long serverTimeMs;
 
     /**
-     * optional uint32 retcode = 1;
+     * optional uint32 retcode = 13;
      */
     private int retcode;
 
@@ -81,7 +81,7 @@ public final class PlayerHeartbeatScRspOuterClass {
     }
 
     /**
-     * optional uint64 server_time_ms = 15;
+     * optional uint64 server_time_ms = 12;
      * @return whether the serverTimeMs field is set
      */
     public boolean hasServerTimeMs() {
@@ -89,7 +89,7 @@ public final class PlayerHeartbeatScRspOuterClass {
     }
 
     /**
-     * optional uint64 server_time_ms = 15;
+     * optional uint64 server_time_ms = 12;
      * @return this
      */
     public PlayerHeartbeatScRsp clearServerTimeMs() {
@@ -99,7 +99,7 @@ public final class PlayerHeartbeatScRspOuterClass {
     }
 
     /**
-     * optional uint64 server_time_ms = 15;
+     * optional uint64 server_time_ms = 12;
      * @return the serverTimeMs
      */
     public long getServerTimeMs() {
@@ -107,7 +107,7 @@ public final class PlayerHeartbeatScRspOuterClass {
     }
 
     /**
-     * optional uint64 server_time_ms = 15;
+     * optional uint64 server_time_ms = 12;
      * @param value the serverTimeMs to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class PlayerHeartbeatScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 1;
+     * 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 = 1;
+     * optional uint32 retcode = 13;
      * @return this
      */
     public PlayerHeartbeatScRsp clearRetcode() {
@@ -136,7 +136,7 @@ public final class PlayerHeartbeatScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 1;
+     * optional uint32 retcode = 13;
      * @return the retcode
      */
     public int getRetcode() {
@@ -144,7 +144,7 @@ public final class PlayerHeartbeatScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 1;
+     * optional uint32 retcode = 13;
      * @param value the retcode to set
      * @return this
      */
@@ -229,11 +229,11 @@ public final class PlayerHeartbeatScRspOuterClass {
         output.writeUInt64NoTag(clientTimeMs);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 96);
         output.writeUInt64NoTag(serverTimeMs);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(retcode);
       }
     }
@@ -265,20 +265,20 @@ public final class PlayerHeartbeatScRspOuterClass {
             clientTimeMs = input.readUInt64();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 96) {
               break;
             }
           }
-          case 120: {
+          case 96: {
             // serverTimeMs
             serverTimeMs = input.readUInt64();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 8) {
+            if (tag != 104) {
               break;
             }
           }
-          case 8: {
+          case 104: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java
index 3ba2343..8162fc8 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java
@@ -19,32 +19,32 @@ public final class PlayerLoginScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint64 login_random = 2;
+     * optional uint64 login_random = 13;
      */
     private long loginRandom;
 
     /**
-     * optional uint64 server_timestamp_ms = 14;
+     * optional uint64 server_timestamp_ms = 15;
      */
     private long serverTimestampMs;
 
     /**
-     * optional uint32 retcode = 8;
-     */
-    private int retcode;
-
-    /**
-     * optional uint32 stamina = 13;
+     * optional uint32 stamina = 6;
      */
     private int stamina;
 
+    /**
+     * optional uint32 retcode = 7;
+     */
+    private int retcode;
+
     /**
      * optional sint32 cur_timezone = 3;
      */
     private int curTimezone;
 
     /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * optional .PlayerBasicInfo basic_info = 5;
      */
     private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance();
 
@@ -59,7 +59,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint64 login_random = 2;
+     * optional uint64 login_random = 13;
      * @return whether the loginRandom field is set
      */
     public boolean hasLoginRandom() {
@@ -67,7 +67,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint64 login_random = 2;
+     * optional uint64 login_random = 13;
      * @return this
      */
     public PlayerLoginScRsp clearLoginRandom() {
@@ -77,7 +77,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint64 login_random = 2;
+     * optional uint64 login_random = 13;
      * @return the loginRandom
      */
     public long getLoginRandom() {
@@ -85,7 +85,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint64 login_random = 2;
+     * optional uint64 login_random = 13;
      * @param value the loginRandom to set
      * @return this
      */
@@ -96,7 +96,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint64 server_timestamp_ms = 14;
+     * optional uint64 server_timestamp_ms = 15;
      * @return whether the serverTimestampMs field is set
      */
     public boolean hasServerTimestampMs() {
@@ -104,7 +104,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint64 server_timestamp_ms = 14;
+     * optional uint64 server_timestamp_ms = 15;
      * @return this
      */
     public PlayerLoginScRsp clearServerTimestampMs() {
@@ -114,7 +114,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint64 server_timestamp_ms = 14;
+     * optional uint64 server_timestamp_ms = 15;
      * @return the serverTimestampMs
      */
     public long getServerTimestampMs() {
@@ -122,7 +122,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint64 server_timestamp_ms = 14;
+     * optional uint64 server_timestamp_ms = 15;
      * @param value the serverTimestampMs to set
      * @return this
      */
@@ -133,62 +133,25 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 8;
-     * @return whether the retcode field is set
+     * optional uint32 stamina = 6;
+     * @return whether the stamina field is set
      */
-    public boolean hasRetcode() {
+    public boolean hasStamina() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional uint32 retcode = 8;
-     * @return this
-     */
-    public PlayerLoginScRsp clearRetcode() {
-      bitField0_ &= ~0x00000004;
-      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 PlayerLoginScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000004;
-      retcode = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 stamina = 13;
-     * @return whether the stamina field is set
-     */
-    public boolean hasStamina() {
-      return (bitField0_ & 0x00000008) != 0;
-    }
-
-    /**
-     * optional uint32 stamina = 13;
+     * optional uint32 stamina = 6;
      * @return this
      */
     public PlayerLoginScRsp clearStamina() {
-      bitField0_ &= ~0x00000008;
+      bitField0_ &= ~0x00000004;
       stamina = 0;
       return this;
     }
 
     /**
-     * optional uint32 stamina = 13;
+     * optional uint32 stamina = 6;
      * @return the stamina
      */
     public int getStamina() {
@@ -196,16 +159,53 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional uint32 stamina = 13;
+     * optional uint32 stamina = 6;
      * @param value the stamina to set
      * @return this
      */
     public PlayerLoginScRsp setStamina(final int value) {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       stamina = value;
       return this;
     }
 
+    /**
+     * optional uint32 retcode = 7;
+     * @return whether the retcode field is set
+     */
+    public boolean hasRetcode() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * optional uint32 retcode = 7;
+     * @return this
+     */
+    public PlayerLoginScRsp clearRetcode() {
+      bitField0_ &= ~0x00000008;
+      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 PlayerLoginScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000008;
+      retcode = value;
+      return this;
+    }
+
     /**
      * optional sint32 cur_timezone = 3;
      * @return whether the curTimezone field is set
@@ -244,7 +244,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * optional .PlayerBasicInfo basic_info = 5;
      * @return whether the basicInfo field is set
      */
     public boolean hasBasicInfo() {
@@ -252,7 +252,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * optional .PlayerBasicInfo basic_info = 5;
      * @return this
      */
     public PlayerLoginScRsp clearBasicInfo() {
@@ -262,7 +262,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * optional .PlayerBasicInfo basic_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.
@@ -276,7 +276,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * optional .PlayerBasicInfo basic_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
@@ -290,7 +290,7 @@ public final class PlayerLoginScRspOuterClass {
     }
 
     /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * optional .PlayerBasicInfo basic_info = 5;
      * @param value the basicInfo to set
      * @return this
      */
@@ -307,8 +307,8 @@ public final class PlayerLoginScRspOuterClass {
         bitField0_ = other.bitField0_;
         loginRandom = other.loginRandom;
         serverTimestampMs = other.serverTimestampMs;
-        retcode = other.retcode;
         stamina = other.stamina;
+        retcode = other.retcode;
         curTimezone = other.curTimezone;
         basicInfo.copyFrom(other.basicInfo);
       }
@@ -327,12 +327,12 @@ public final class PlayerLoginScRspOuterClass {
       if (other.hasServerTimestampMs()) {
         setServerTimestampMs(other.serverTimestampMs);
       }
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
-      }
       if (other.hasStamina()) {
         setStamina(other.stamina);
       }
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
+      }
       if (other.hasCurTimezone()) {
         setCurTimezone(other.curTimezone);
       }
@@ -351,8 +351,8 @@ public final class PlayerLoginScRspOuterClass {
       bitField0_ = 0;
       loginRandom = 0L;
       serverTimestampMs = 0L;
-      retcode = 0;
       stamina = 0;
+      retcode = 0;
       curTimezone = 0;
       basicInfo.clear();
       return this;
@@ -381,8 +381,8 @@ public final class PlayerLoginScRspOuterClass {
       return bitField0_ == other.bitField0_
         && (!hasLoginRandom() || loginRandom == other.loginRandom)
         && (!hasServerTimestampMs() || serverTimestampMs == other.serverTimestampMs)
-        && (!hasRetcode() || retcode == other.retcode)
         && (!hasStamina() || stamina == other.stamina)
+        && (!hasRetcode() || retcode == other.retcode)
         && (!hasCurTimezone() || curTimezone == other.curTimezone)
         && (!hasBasicInfo() || basicInfo.equals(other.basicInfo));
     }
@@ -390,27 +390,27 @@ public final class PlayerLoginScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 104);
         output.writeUInt64NoTag(loginRandom);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 112);
+        output.writeRawByte((byte) 120);
         output.writeUInt64NoTag(serverTimestampMs);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 64);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 48);
+        output.writeUInt32NoTag(stamina);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 104);
-        output.writeUInt32NoTag(stamina);
+        output.writeRawByte((byte) 56);
+        output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         output.writeRawByte((byte) 24);
         output.writeSInt32NoTag(curTimezone);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 90);
+        output.writeRawByte((byte) 42);
         output.writeMessageNoTag(basicInfo);
       }
     }
@@ -425,10 +425,10 @@ public final class PlayerLoginScRspOuterClass {
         size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimestampMs);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         size += 1 + ProtoSink.computeSInt32SizeNoTag(curTimezone);
@@ -446,36 +446,36 @@ public final class PlayerLoginScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
+          case 104: {
             // loginRandom
             loginRandom = input.readUInt64();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 112) {
+            if (tag != 120) {
               break;
             }
           }
-          case 112: {
+          case 120: {
             // serverTimestampMs
             serverTimestampMs = input.readUInt64();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 48) {
               break;
             }
           }
-          case 64: {
-            // retcode
-            retcode = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 104) {
-              break;
-            }
-          }
-          case 104: {
+          case 48: {
             // stamina
             stamina = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 56) {
+              break;
+            }
+          }
+          case 56: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
             if (tag != 24) {
@@ -487,11 +487,11 @@ public final class PlayerLoginScRspOuterClass {
             curTimezone = input.readSInt32();
             bitField0_ |= 0x00000010;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 42) {
               break;
             }
           }
-          case 90: {
+          case 42: {
             // basicInfo
             input.readMessage(basicInfo);
             bitField0_ |= 0x00000020;
@@ -524,10 +524,10 @@ public final class PlayerLoginScRspOuterClass {
         output.writeUInt64(FieldNames.serverTimestampMs, serverTimestampMs);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.stamina, stamina);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.stamina, stamina);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         output.writeSInt32(FieldNames.curTimezone, curTimezone);
@@ -569,10 +569,10 @@ public final class PlayerLoginScRspOuterClass {
             }
             break;
           }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case -1897344401: {
+            if (input.isAtField(FieldNames.stamina)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                stamina = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -580,10 +580,10 @@ public final class PlayerLoginScRspOuterClass {
             }
             break;
           }
-          case -1897344401: {
-            if (input.isAtField(FieldNames.stamina)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                stamina = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -672,10 +672,10 @@ public final class PlayerLoginScRspOuterClass {
 
       static final FieldName serverTimestampMs = FieldName.forField("serverTimestampMs", "server_timestamp_ms");
 
-      static final FieldName retcode = FieldName.forField("retcode");
-
       static final FieldName stamina = FieldName.forField("stamina");
 
+      static final FieldName retcode = FieldName.forField("retcode");
+
       static final FieldName curTimezone = FieldName.forField("curTimezone", "cur_timezone");
 
       static final FieldName basicInfo = FieldName.forField("basicInfo", "basic_info");
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java
index a9d396a..a8aca86 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java
@@ -21,57 +21,57 @@ public final class PlayerSyncScNotifyOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 total_achievement_exp = 552;
+     * optional uint32 total_achievement_exp = 1522;
      */
     private int totalAchievementExp;
 
     /**
-     * optional .AvatarSync avatar_sync = 9;
-     */
-    private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance();
-
-    /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * optional .PlayerBasicInfo basic_info = 4;
      */
     private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance();
 
     /**
-     * optional .MissionSync mission_sync = 12;
+     * optional .MissionSync mission_sync = 9;
      */
     private final MissionSyncOuterClass.MissionSync missionSync = MissionSyncOuterClass.MissionSync.newInstance();
 
     /**
-     * optional .BoardDataSync board_data_sync = 1569;
+     * optional .AvatarSync avatar_sync = 10;
+     */
+    private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance();
+
+    /**
+     * optional .BoardDataSync board_data_sync = 1273;
      */
     private final BoardDataSyncOuterClass.BoardDataSync boardDataSync = BoardDataSyncOuterClass.BoardDataSync.newInstance();
 
     /**
-     * repeated uint32 del_equipment_list = 4;
-     */
-    private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance();
-
-    /**
-     * repeated uint32 del_relic_list = 14;
+     * repeated uint32 del_relic_list = 8;
      */
     private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance();
 
     /**
-     * repeated .Relic relic_list = 1;
+     * repeated uint32 del_equipment_list = 12;
      */
-    private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory());
+    private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance();
 
     /**
-     * repeated .Material material_list = 3;
-     */
-    private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory());
-
-    /**
-     * repeated .Equipment equipment_list = 6;
+     * repeated .Equipment equipment_list = 5;
      */
     private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory());
 
     /**
-     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767;
+     * repeated .Relic relic_list = 7;
+     */
+    private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory());
+
+    /**
+     * repeated .Material material_list = 14;
+     */
+    private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory());
+
+    /**
+     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1834;
      */
     private final RepeatedMessage multiPathAvatarInfoList = RepeatedMessage.newEmptyInstance(MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo.getFactory());
 
@@ -86,7 +86,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 total_achievement_exp = 552;
+     * optional uint32 total_achievement_exp = 1522;
      * @return whether the totalAchievementExp field is set
      */
     public boolean hasTotalAchievementExp() {
@@ -94,7 +94,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 total_achievement_exp = 552;
+     * optional uint32 total_achievement_exp = 1522;
      * @return this
      */
     public PlayerSyncScNotify clearTotalAchievementExp() {
@@ -104,7 +104,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 total_achievement_exp = 552;
+     * optional uint32 total_achievement_exp = 1522;
      * @return the totalAchievementExp
      */
     public int getTotalAchievementExp() {
@@ -112,7 +112,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 total_achievement_exp = 552;
+     * optional uint32 total_achievement_exp = 1522;
      * @param value the totalAchievementExp to set
      * @return this
      */
@@ -123,82 +123,25 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * optional .AvatarSync avatar_sync = 9;
-     * @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 = 9;
-     * @return this
-     */
-    public PlayerSyncScNotify clearAvatarSync() {
-      bitField0_ &= ~0x00000002;
-      avatarSync.clear();
-      return this;
-    }
-
-    /**
-     * optional .AvatarSync avatar_sync = 9;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * 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 = 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 AvatarSyncOuterClass.AvatarSync getMutableAvatarSync() {
-      bitField0_ |= 0x00000002;
-      return avatarSync;
-    }
-
-    /**
-     * optional .AvatarSync avatar_sync = 9;
-     * @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 = 11;
-     * @return whether the basicInfo field is set
-     */
-    public boolean hasBasicInfo() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * optional .PlayerBasicInfo basic_info = 4;
      * @return this
      */
     public PlayerSyncScNotify clearBasicInfo() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       basicInfo.clear();
       return this;
     }
 
     /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * 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 = 11;
+     * 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,41 +164,41 @@ public final class PlayerSyncScNotifyOuterClass {
      * @return internal storage object for modifications
      */
     public PlayerBasicInfoOuterClass.PlayerBasicInfo getMutableBasicInfo() {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       return basicInfo;
     }
 
     /**
-     * optional .PlayerBasicInfo basic_info = 11;
+     * 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 = 12;
+     * optional .MissionSync mission_sync = 9;
      * @return whether the missionSync field is set
      */
     public boolean hasMissionSync() {
-      return (bitField0_ & 0x00000008) != 0;
+      return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional .MissionSync mission_sync = 12;
+     * optional .MissionSync mission_sync = 9;
      * @return this
      */
     public PlayerSyncScNotify clearMissionSync() {
-      bitField0_ &= ~0x00000008;
+      bitField0_ &= ~0x00000004;
       missionSync.clear();
       return this;
     }
 
     /**
-     * optional .MissionSync mission_sync = 12;
+     * 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 +212,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * optional .MissionSync mission_sync = 12;
+     * 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
@@ -278,23 +221,80 @@ public final class PlayerSyncScNotifyOuterClass {
      * @return internal storage object for modifications
      */
     public MissionSyncOuterClass.MissionSync getMutableMissionSync() {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       return missionSync;
     }
 
     /**
-     * optional .MissionSync mission_sync = 12;
+     * optional .MissionSync mission_sync = 9;
      * @param value the missionSync to set
      * @return this
      */
     public PlayerSyncScNotify setMissionSync(final MissionSyncOuterClass.MissionSync value) {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       missionSync.copyFrom(value);
       return this;
     }
 
     /**
-     * optional .BoardDataSync board_data_sync = 1569;
+     * optional .AvatarSync avatar_sync = 10;
+     * @return whether the avatarSync field is set
+     */
+    public boolean hasAvatarSync() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * optional .AvatarSync avatar_sync = 10;
+     * @return this
+     */
+    public PlayerSyncScNotify clearAvatarSync() {
+      bitField0_ &= ~0x00000008;
+      avatarSync.clear();
+      return this;
+    }
+
+    /**
+     * optional .AvatarSync avatar_sync = 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 #getMutableAvatarSync()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public AvatarSyncOuterClass.AvatarSync getAvatarSync() {
+      return avatarSync;
+    }
+
+    /**
+     * optional .AvatarSync avatar_sync = 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 AvatarSyncOuterClass.AvatarSync getMutableAvatarSync() {
+      bitField0_ |= 0x00000008;
+      return avatarSync;
+    }
+
+    /**
+     * optional .AvatarSync avatar_sync = 10;
+     * @param value the avatarSync to set
+     * @return this
+     */
+    public PlayerSyncScNotify setAvatarSync(final AvatarSyncOuterClass.AvatarSync value) {
+      bitField0_ |= 0x00000008;
+      avatarSync.copyFrom(value);
+      return this;
+    }
+
+    /**
+     * optional .BoardDataSync board_data_sync = 1273;
      * @return whether the boardDataSync field is set
      */
     public boolean hasBoardDataSync() {
@@ -302,7 +302,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * optional .BoardDataSync board_data_sync = 1569;
+     * optional .BoardDataSync board_data_sync = 1273;
      * @return this
      */
     public PlayerSyncScNotify clearBoardDataSync() {
@@ -312,7 +312,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * optional .BoardDataSync board_data_sync = 1569;
+     * optional .BoardDataSync board_data_sync = 1273;
      *
      * This 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 = 1569;
+     * optional .BoardDataSync board_data_sync = 1273;
      *
      * 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 = 1569;
+     * optional .BoardDataSync board_data_sync = 1273;
      * @param value the boardDataSync to set
      * @return this
      */
@@ -351,93 +351,25 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * repeated uint32 del_equipment_list = 4;
-     * @return whether the delEquipmentList field is set
+     * repeated uint32 del_relic_list = 8;
+     * @return whether the delRelicList field is set
      */
-    public boolean hasDelEquipmentList() {
+    public boolean hasDelRelicList() {
       return (bitField0_ & 0x00000020) != 0;
     }
 
     /**
-     * repeated uint32 del_equipment_list = 4;
-     * @return this
-     */
-    public PlayerSyncScNotify clearDelEquipmentList() {
-      bitField0_ &= ~0x00000020;
-      delEquipmentList.clear();
-      return this;
-    }
-
-    /**
-     * repeated uint32 del_equipment_list = 4;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableDelEquipmentList()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RepeatedInt getDelEquipmentList() {
-      return delEquipmentList;
-    }
-
-    /**
-     * repeated uint32 del_equipment_list = 4;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public RepeatedInt getMutableDelEquipmentList() {
-      bitField0_ |= 0x00000020;
-      return delEquipmentList;
-    }
-
-    /**
-     * repeated uint32 del_equipment_list = 4;
-     * @param value the delEquipmentList to add
-     * @return this
-     */
-    public PlayerSyncScNotify addDelEquipmentList(final int value) {
-      bitField0_ |= 0x00000020;
-      delEquipmentList.add(value);
-      return this;
-    }
-
-    /**
-     * repeated uint32 del_equipment_list = 4;
-     * @param values the delEquipmentList to add
-     * @return this
-     */
-    public PlayerSyncScNotify addAllDelEquipmentList(final int... values) {
-      bitField0_ |= 0x00000020;
-      delEquipmentList.addAll(values);
-      return this;
-    }
-
-    /**
-     * repeated uint32 del_relic_list = 14;
-     * @return whether the delRelicList field is set
-     */
-    public boolean hasDelRelicList() {
-      return (bitField0_ & 0x00000040) != 0;
-    }
-
-    /**
-     * repeated uint32 del_relic_list = 14;
+     * repeated uint32 del_relic_list = 8;
      * @return this
      */
     public PlayerSyncScNotify clearDelRelicList() {
-      bitField0_ &= ~0x00000040;
+      bitField0_ &= ~0x00000020;
       delRelicList.clear();
       return this;
     }
 
     /**
-     * repeated uint32 del_relic_list = 14;
+     * repeated uint32 del_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.
@@ -451,7 +383,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * repeated uint32 del_relic_list = 14;
+     * repeated uint32 del_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
@@ -460,188 +392,120 @@ public final class PlayerSyncScNotifyOuterClass {
      * @return internal storage object for modifications
      */
     public RepeatedInt getMutableDelRelicList() {
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000020;
       return delRelicList;
     }
 
     /**
-     * repeated uint32 del_relic_list = 14;
+     * repeated uint32 del_relic_list = 8;
      * @param value the delRelicList to add
      * @return this
      */
     public PlayerSyncScNotify addDelRelicList(final int value) {
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000020;
       delRelicList.add(value);
       return this;
     }
 
     /**
-     * repeated uint32 del_relic_list = 14;
+     * repeated uint32 del_relic_list = 8;
      * @param values the delRelicList to add
      * @return this
      */
     public PlayerSyncScNotify addAllDelRelicList(final int... values) {
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000020;
       delRelicList.addAll(values);
       return this;
     }
 
     /**
-     * repeated .Relic relic_list = 1;
-     * @return whether the relicList field is set
+     * repeated uint32 del_equipment_list = 12;
+     * @return whether the delEquipmentList field is set
      */
-    public boolean hasRelicList() {
+    public boolean hasDelEquipmentList() {
+      return (bitField0_ & 0x00000040) != 0;
+    }
+
+    /**
+     * repeated uint32 del_equipment_list = 12;
+     * @return this
+     */
+    public PlayerSyncScNotify clearDelEquipmentList() {
+      bitField0_ &= ~0x00000040;
+      delEquipmentList.clear();
+      return this;
+    }
+
+    /**
+     * repeated uint32 del_equipment_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 #getMutableDelEquipmentList()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public RepeatedInt getDelEquipmentList() {
+      return delEquipmentList;
+    }
+
+    /**
+     * repeated uint32 del_equipment_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 getMutableDelEquipmentList() {
+      bitField0_ |= 0x00000040;
+      return delEquipmentList;
+    }
+
+    /**
+     * repeated uint32 del_equipment_list = 12;
+     * @param value the delEquipmentList to add
+     * @return this
+     */
+    public PlayerSyncScNotify addDelEquipmentList(final int value) {
+      bitField0_ |= 0x00000040;
+      delEquipmentList.add(value);
+      return this;
+    }
+
+    /**
+     * repeated uint32 del_equipment_list = 12;
+     * @param values the delEquipmentList to add
+     * @return this
+     */
+    public PlayerSyncScNotify addAllDelEquipmentList(final int... values) {
+      bitField0_ |= 0x00000040;
+      delEquipmentList.addAll(values);
+      return this;
+    }
+
+    /**
+     * repeated .Equipment equipment_list = 5;
+     * @return whether the equipmentList field is set
+     */
+    public boolean hasEquipmentList() {
       return (bitField0_ & 0x00000080) != 0;
     }
 
     /**
-     * repeated .Relic relic_list = 1;
-     * @return this
-     */
-    public PlayerSyncScNotify clearRelicList() {
-      bitField0_ &= ~0x00000080;
-      relicList.clear();
-      return this;
-    }
-
-    /**
-     * repeated .Relic relic_list = 1;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableRelicList()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RepeatedMessage getRelicList() {
-      return relicList;
-    }
-
-    /**
-     * repeated .Relic relic_list = 1;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public RepeatedMessage getMutableRelicList() {
-      bitField0_ |= 0x00000080;
-      return relicList;
-    }
-
-    /**
-     * repeated .Relic relic_list = 1;
-     * @param value the relicList to add
-     * @return this
-     */
-    public PlayerSyncScNotify addRelicList(final RelicOuterClass.Relic value) {
-      bitField0_ |= 0x00000080;
-      relicList.add(value);
-      return this;
-    }
-
-    /**
-     * repeated .Relic relic_list = 1;
-     * @param values the relicList to add
-     * @return this
-     */
-    public PlayerSyncScNotify addAllRelicList(final RelicOuterClass.Relic... values) {
-      bitField0_ |= 0x00000080;
-      relicList.addAll(values);
-      return this;
-    }
-
-    /**
-     * repeated .Material material_list = 3;
-     * @return whether the materialList field is set
-     */
-    public boolean hasMaterialList() {
-      return (bitField0_ & 0x00000100) != 0;
-    }
-
-    /**
-     * repeated .Material material_list = 3;
-     * @return this
-     */
-    public PlayerSyncScNotify clearMaterialList() {
-      bitField0_ &= ~0x00000100;
-      materialList.clear();
-      return this;
-    }
-
-    /**
-     * repeated .Material material_list = 3;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableMaterialList()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RepeatedMessage getMaterialList() {
-      return materialList;
-    }
-
-    /**
-     * repeated .Material material_list = 3;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * 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 = 3;
-     * @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 = 3;
-     * @param values the materialList to add
-     * @return this
-     */
-    public PlayerSyncScNotify addAllMaterialList(final MaterialOuterClass.Material... values) {
-      bitField0_ |= 0x00000100;
-      materialList.addAll(values);
-      return this;
-    }
-
-    /**
-     * repeated .Equipment equipment_list = 6;
-     * @return whether the equipmentList field is set
-     */
-    public boolean hasEquipmentList() {
-      return (bitField0_ & 0x00000200) != 0;
-    }
-
-    /**
-     * repeated .Equipment equipment_list = 6;
+     * repeated .Equipment equipment_list = 5;
      * @return this
      */
     public PlayerSyncScNotify clearEquipmentList() {
-      bitField0_ &= ~0x00000200;
+      bitField0_ &= ~0x00000080;
       equipmentList.clear();
       return this;
     }
 
     /**
-     * repeated .Equipment equipment_list = 6;
+     * repeated .Equipment equipment_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.
@@ -655,7 +519,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * repeated .Equipment equipment_list = 6;
+     * repeated .Equipment equipment_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
@@ -664,34 +528,170 @@ public final class PlayerSyncScNotifyOuterClass {
      * @return internal storage object for modifications
      */
     public RepeatedMessage getMutableEquipmentList() {
-      bitField0_ |= 0x00000200;
+      bitField0_ |= 0x00000080;
       return equipmentList;
     }
 
     /**
-     * repeated .Equipment equipment_list = 6;
+     * repeated .Equipment equipment_list = 5;
      * @param value the equipmentList to add
      * @return this
      */
     public PlayerSyncScNotify addEquipmentList(final EquipmentOuterClass.Equipment value) {
-      bitField0_ |= 0x00000200;
+      bitField0_ |= 0x00000080;
       equipmentList.add(value);
       return this;
     }
 
     /**
-     * repeated .Equipment equipment_list = 6;
+     * repeated .Equipment equipment_list = 5;
      * @param values the equipmentList to add
      * @return this
      */
     public PlayerSyncScNotify addAllEquipmentList(final EquipmentOuterClass.Equipment... values) {
-      bitField0_ |= 0x00000200;
+      bitField0_ |= 0x00000080;
       equipmentList.addAll(values);
       return this;
     }
 
     /**
-     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767;
+     * repeated .Relic relic_list = 7;
+     * @return whether the relicList field is set
+     */
+    public boolean hasRelicList() {
+      return (bitField0_ & 0x00000100) != 0;
+    }
+
+    /**
+     * repeated .Relic relic_list = 7;
+     * @return this
+     */
+    public PlayerSyncScNotify clearRelicList() {
+      bitField0_ &= ~0x00000100;
+      relicList.clear();
+      return this;
+    }
+
+    /**
+     * repeated .Relic relic_list = 7;
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableRelicList()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public RepeatedMessage getRelicList() {
+      return relicList;
+    }
+
+    /**
+     * repeated .Relic relic_list = 7;
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public RepeatedMessage getMutableRelicList() {
+      bitField0_ |= 0x00000100;
+      return relicList;
+    }
+
+    /**
+     * repeated .Relic relic_list = 7;
+     * @param value the relicList to add
+     * @return this
+     */
+    public PlayerSyncScNotify addRelicList(final RelicOuterClass.Relic value) {
+      bitField0_ |= 0x00000100;
+      relicList.add(value);
+      return this;
+    }
+
+    /**
+     * repeated .Relic relic_list = 7;
+     * @param values the relicList to add
+     * @return this
+     */
+    public PlayerSyncScNotify addAllRelicList(final RelicOuterClass.Relic... values) {
+      bitField0_ |= 0x00000100;
+      relicList.addAll(values);
+      return this;
+    }
+
+    /**
+     * repeated .Material material_list = 14;
+     * @return whether the materialList field is set
+     */
+    public boolean hasMaterialList() {
+      return (bitField0_ & 0x00000200) != 0;
+    }
+
+    /**
+     * repeated .Material material_list = 14;
+     * @return this
+     */
+    public PlayerSyncScNotify clearMaterialList() {
+      bitField0_ &= ~0x00000200;
+      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_ |= 0x00000200;
+      return materialList;
+    }
+
+    /**
+     * repeated .Material material_list = 14;
+     * @param value the materialList to add
+     * @return this
+     */
+    public PlayerSyncScNotify addMaterialList(final MaterialOuterClass.Material value) {
+      bitField0_ |= 0x00000200;
+      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_ |= 0x00000200;
+      materialList.addAll(values);
+      return this;
+    }
+
+    /**
+     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1834;
      * @return whether the multiPathAvatarInfoList field is set
      */
     public boolean hasMultiPathAvatarInfoList() {
@@ -699,7 +699,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767;
+     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1834;
      * @return this
      */
     public PlayerSyncScNotify clearMultiPathAvatarInfoList() {
@@ -709,7 +709,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767;
+     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1834;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -724,7 +724,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767;
+     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1834;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -739,7 +739,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767;
+     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1834;
      * @param value the multiPathAvatarInfoList to add
      * @return this
      */
@@ -751,7 +751,7 @@ public final class PlayerSyncScNotifyOuterClass {
     }
 
     /**
-     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767;
+     * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1834;
      * @param values the multiPathAvatarInfoList to add
      * @return this
      */
@@ -768,15 +768,15 @@ public final class PlayerSyncScNotifyOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         totalAchievementExp = other.totalAchievementExp;
-        avatarSync.copyFrom(other.avatarSync);
         basicInfo.copyFrom(other.basicInfo);
         missionSync.copyFrom(other.missionSync);
+        avatarSync.copyFrom(other.avatarSync);
         boardDataSync.copyFrom(other.boardDataSync);
-        delEquipmentList.copyFrom(other.delEquipmentList);
         delRelicList.copyFrom(other.delRelicList);
+        delEquipmentList.copyFrom(other.delEquipmentList);
+        equipmentList.copyFrom(other.equipmentList);
         relicList.copyFrom(other.relicList);
         materialList.copyFrom(other.materialList);
-        equipmentList.copyFrom(other.equipmentList);
         multiPathAvatarInfoList.copyFrom(other.multiPathAvatarInfoList);
       }
       return this;
@@ -791,23 +791,26 @@ 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.hasMissionSync()) {
         getMutableMissionSync().mergeFrom(other.missionSync);
       }
+      if (other.hasAvatarSync()) {
+        getMutableAvatarSync().mergeFrom(other.avatarSync);
+      }
       if (other.hasBoardDataSync()) {
         getMutableBoardDataSync().mergeFrom(other.boardDataSync);
       }
+      if (other.hasDelRelicList()) {
+        getMutableDelRelicList().addAll(other.delRelicList);
+      }
       if (other.hasDelEquipmentList()) {
         getMutableDelEquipmentList().addAll(other.delEquipmentList);
       }
-      if (other.hasDelRelicList()) {
-        getMutableDelRelicList().addAll(other.delRelicList);
+      if (other.hasEquipmentList()) {
+        getMutableEquipmentList().addAll(other.equipmentList);
       }
       if (other.hasRelicList()) {
         getMutableRelicList().addAll(other.relicList);
@@ -815,9 +818,6 @@ public final class PlayerSyncScNotifyOuterClass {
       if (other.hasMaterialList()) {
         getMutableMaterialList().addAll(other.materialList);
       }
-      if (other.hasEquipmentList()) {
-        getMutableEquipmentList().addAll(other.equipmentList);
-      }
       if (other.hasMultiPathAvatarInfoList()) {
         getMutableMultiPathAvatarInfoList().addAll(other.multiPathAvatarInfoList);
       }
@@ -832,15 +832,15 @@ public final class PlayerSyncScNotifyOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       totalAchievementExp = 0;
-      avatarSync.clear();
       basicInfo.clear();
       missionSync.clear();
+      avatarSync.clear();
       boardDataSync.clear();
-      delEquipmentList.clear();
       delRelicList.clear();
+      delEquipmentList.clear();
+      equipmentList.clear();
       relicList.clear();
       materialList.clear();
-      equipmentList.clear();
       multiPathAvatarInfoList.clear();
       return this;
     }
@@ -852,15 +852,15 @@ public final class PlayerSyncScNotifyOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      avatarSync.clearQuick();
       basicInfo.clearQuick();
       missionSync.clearQuick();
+      avatarSync.clearQuick();
       boardDataSync.clearQuick();
-      delEquipmentList.clear();
       delRelicList.clear();
+      delEquipmentList.clear();
+      equipmentList.clearQuick();
       relicList.clearQuick();
       materialList.clearQuick();
-      equipmentList.clearQuick();
       multiPathAvatarInfoList.clearQuick();
       return this;
     }
@@ -876,73 +876,73 @@ 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))
         && (!hasMissionSync() || missionSync.equals(other.missionSync))
+        && (!hasAvatarSync() || avatarSync.equals(other.avatarSync))
         && (!hasBoardDataSync() || boardDataSync.equals(other.boardDataSync))
-        && (!hasDelEquipmentList() || delEquipmentList.equals(other.delEquipmentList))
         && (!hasDelRelicList() || delRelicList.equals(other.delRelicList))
+        && (!hasDelEquipmentList() || delEquipmentList.equals(other.delEquipmentList))
+        && (!hasEquipmentList() || equipmentList.equals(other.equipmentList))
         && (!hasRelicList() || relicList.equals(other.relicList))
         && (!hasMaterialList() || materialList.equals(other.materialList))
-        && (!hasEquipmentList() || equipmentList.equals(other.equipmentList))
         && (!hasMultiPathAvatarInfoList() || multiPathAvatarInfoList.equals(other.multiPathAvatarInfoList));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawLittleEndian16((short) 8896);
+        output.writeRawLittleEndian16((short) 24464);
         output.writeUInt32NoTag(totalAchievementExp);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 74);
-        output.writeMessageNoTag(avatarSync);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 90);
+        output.writeRawByte((byte) 34);
         output.writeMessageNoTag(basicInfo);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 98);
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 74);
         output.writeMessageNoTag(missionSync);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeRawByte((byte) 82);
+        output.writeMessageNoTag(avatarSync);
+      }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawLittleEndian16((short) 25226);
+        output.writeRawLittleEndian16((short) 20426);
         output.writeMessageNoTag(boardDataSync);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        for (int i = 0; i < delEquipmentList.length(); i++) {
-          output.writeRawByte((byte) 32);
-          output.writeUInt32NoTag(delEquipmentList.array()[i]);
-        }
-      }
-      if ((bitField0_ & 0x00000040) != 0) {
         for (int i = 0; i < delRelicList.length(); i++) {
-          output.writeRawByte((byte) 112);
+          output.writeRawByte((byte) 64);
           output.writeUInt32NoTag(delRelicList.array()[i]);
         }
       }
+      if ((bitField0_ & 0x00000040) != 0) {
+        for (int i = 0; i < delEquipmentList.length(); i++) {
+          output.writeRawByte((byte) 96);
+          output.writeUInt32NoTag(delEquipmentList.array()[i]);
+        }
+      }
       if ((bitField0_ & 0x00000080) != 0) {
-        for (int i = 0; i < relicList.length(); i++) {
-          output.writeRawByte((byte) 10);
-          output.writeMessageNoTag(relicList.get(i));
+        for (int i = 0; i < equipmentList.length(); i++) {
+          output.writeRawByte((byte) 42);
+          output.writeMessageNoTag(equipmentList.get(i));
         }
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        for (int i = 0; i < materialList.length(); i++) {
-          output.writeRawByte((byte) 26);
-          output.writeMessageNoTag(materialList.get(i));
+        for (int i = 0; i < relicList.length(); i++) {
+          output.writeRawByte((byte) 58);
+          output.writeMessageNoTag(relicList.get(i));
         }
       }
       if ((bitField0_ & 0x00000200) != 0) {
-        for (int i = 0; i < equipmentList.length(); i++) {
-          output.writeRawByte((byte) 50);
-          output.writeMessageNoTag(equipmentList.get(i));
+        for (int i = 0; i < materialList.length(); i++) {
+          output.writeRawByte((byte) 114);
+          output.writeMessageNoTag(materialList.get(i));
         }
       }
       if ((bitField0_ & 0x00000400) != 0) {
         for (int i = 0; i < multiPathAvatarInfoList.length(); i++) {
-          output.writeRawLittleEndian16((short) 28346);
+          output.writeRawLittleEndian16((short) 29394);
           output.writeMessageNoTag(multiPathAvatarInfoList.get(i));
         }
       }
@@ -955,31 +955,31 @@ public final class PlayerSyncScNotifyOuterClass {
         size += 2 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(avatarSync);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(basicInfo);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(missionSync);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        size += 1 + ProtoSink.computeMessageSizeNoTag(avatarSync);
+      }
       if ((bitField0_ & 0x00000010) != 0) {
         size += 2 + ProtoSink.computeMessageSizeNoTag(boardDataSync);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        size += (1 * delEquipmentList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delEquipmentList);
-      }
-      if ((bitField0_ & 0x00000040) != 0) {
         size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList);
       }
+      if ((bitField0_ & 0x00000040) != 0) {
+        size += (1 * delEquipmentList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delEquipmentList);
+      }
       if ((bitField0_ & 0x00000080) != 0) {
-        size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList);
+        size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList);
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList);
+        size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList);
       }
       if ((bitField0_ & 0x00000200) != 0) {
-        size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList);
+        size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList);
       }
       if ((bitField0_ & 0x00000400) != 0) {
         size += (2 * multiPathAvatarInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(multiPathAvatarInfoList);
@@ -994,94 +994,94 @@ public final class PlayerSyncScNotifyOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 4416: {
+          case 12176: {
             // totalAchievementExp
             totalAchievementExp = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 74) {
-              break;
-            }
-          }
-          case 74: {
-            // avatarSync
-            input.readMessage(avatarSync);
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 90) {
-              break;
-            }
-          }
-          case 90: {
-            // basicInfo
-            input.readMessage(basicInfo);
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 98) {
-              break;
-            }
-          }
-          case 98: {
-            // missionSync
-            input.readMessage(missionSync);
-            bitField0_ |= 0x00000008;
-            tag = input.readTag();
-            if (tag != 12554) {
-              break;
-            }
-          }
-          case 12554: {
-            // boardDataSync
-            input.readMessage(boardDataSync);
-            bitField0_ |= 0x00000010;
-            tag = input.readTag();
             if (tag != 34) {
               break;
             }
           }
           case 34: {
-            // delEquipmentList [packed=true]
-            input.readPackedUInt32(delEquipmentList, tag);
+            // basicInfo
+            input.readMessage(basicInfo);
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 74) {
+              break;
+            }
+          }
+          case 74: {
+            // missionSync
+            input.readMessage(missionSync);
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 82) {
+              break;
+            }
+          }
+          case 82: {
+            // avatarSync
+            input.readMessage(avatarSync);
+            bitField0_ |= 0x00000008;
+            tag = input.readTag();
+            if (tag != 10186) {
+              break;
+            }
+          }
+          case 10186: {
+            // boardDataSync
+            input.readMessage(boardDataSync);
+            bitField0_ |= 0x00000010;
+            tag = input.readTag();
+            if (tag != 66) {
+              break;
+            }
+          }
+          case 66: {
+            // delRelicList [packed=true]
+            input.readPackedUInt32(delRelicList, tag);
             bitField0_ |= 0x00000020;
             tag = input.readTag();
+            if (tag != 98) {
+              break;
+            }
+          }
+          case 98: {
+            // delEquipmentList [packed=true]
+            input.readPackedUInt32(delEquipmentList, tag);
+            bitField0_ |= 0x00000040;
+            tag = input.readTag();
+            if (tag != 42) {
+              break;
+            }
+          }
+          case 42: {
+            // equipmentList
+            tag = input.readRepeatedMessage(equipmentList, tag);
+            bitField0_ |= 0x00000080;
+            if (tag != 58) {
+              break;
+            }
+          }
+          case 58: {
+            // relicList
+            tag = input.readRepeatedMessage(relicList, tag);
+            bitField0_ |= 0x00000100;
             if (tag != 114) {
               break;
             }
           }
           case 114: {
-            // delRelicList [packed=true]
-            input.readPackedUInt32(delRelicList, tag);
-            bitField0_ |= 0x00000040;
-            tag = input.readTag();
-            if (tag != 10) {
-              break;
-            }
-          }
-          case 10: {
-            // relicList
-            tag = input.readRepeatedMessage(relicList, tag);
-            bitField0_ |= 0x00000080;
-            if (tag != 26) {
-              break;
-            }
-          }
-          case 26: {
             // materialList
             tag = input.readRepeatedMessage(materialList, tag);
-            bitField0_ |= 0x00000100;
-            if (tag != 50) {
-              break;
-            }
-          }
-          case 50: {
-            // equipmentList
-            tag = input.readRepeatedMessage(equipmentList, tag);
             bitField0_ |= 0x00000200;
-            if (tag != 14138) {
+            if (tag != 14674) {
               break;
             }
           }
-          case 14138: {
+          case 14674: {
             // multiPathAvatarInfoList
             tag = input.readRepeatedMessage(multiPathAvatarInfoList, tag);
             bitField0_ |= 0x00000400;
@@ -1099,15 +1099,15 @@ public final class PlayerSyncScNotifyOuterClass {
             tag = input.readTag();
             break;
           }
-          case 32: {
-            // delEquipmentList [packed=false]
-            tag = input.readRepeatedUInt32(delEquipmentList, tag);
+          case 64: {
+            // delRelicList [packed=false]
+            tag = input.readRepeatedUInt32(delRelicList, tag);
             bitField0_ |= 0x00000020;
             break;
           }
-          case 112: {
-            // delRelicList [packed=false]
-            tag = input.readRepeatedUInt32(delRelicList, tag);
+          case 96: {
+            // delEquipmentList [packed=false]
+            tag = input.readRepeatedUInt32(delEquipmentList, tag);
             bitField0_ |= 0x00000040;
             break;
           }
@@ -1122,31 +1122,31 @@ public final class PlayerSyncScNotifyOuterClass {
         output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeMessage(FieldNames.avatarSync, avatarSync);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         output.writeMessage(FieldNames.basicInfo, basicInfo);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000004) != 0) {
         output.writeMessage(FieldNames.missionSync, missionSync);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeMessage(FieldNames.avatarSync, avatarSync);
+      }
       if ((bitField0_ & 0x00000010) != 0) {
         output.writeMessage(FieldNames.boardDataSync, boardDataSync);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRepeatedUInt32(FieldNames.delEquipmentList, delEquipmentList);
-      }
-      if ((bitField0_ & 0x00000040) != 0) {
         output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList);
       }
+      if ((bitField0_ & 0x00000040) != 0) {
+        output.writeRepeatedUInt32(FieldNames.delEquipmentList, delEquipmentList);
+      }
       if ((bitField0_ & 0x00000080) != 0) {
-        output.writeRepeatedMessage(FieldNames.relicList, relicList);
+        output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList);
       }
       if ((bitField0_ & 0x00000100) != 0) {
-        output.writeRepeatedMessage(FieldNames.materialList, materialList);
+        output.writeRepeatedMessage(FieldNames.relicList, relicList);
       }
       if ((bitField0_ & 0x00000200) != 0) {
-        output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList);
+        output.writeRepeatedMessage(FieldNames.materialList, materialList);
       }
       if ((bitField0_ & 0x00000400) != 0) {
         output.writeRepeatedMessage(FieldNames.multiPathAvatarInfoList, multiPathAvatarInfoList);
@@ -1173,24 +1173,12 @@ public final class PlayerSyncScNotifyOuterClass {
             }
             break;
           }
-          case -403178604:
-          case 397279681: {
-            if (input.isAtField(FieldNames.avatarSync)) {
-              if (!input.trySkipNullValue()) {
-                input.readMessage(avatarSync);
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case -1699486212:
           case -1124288993: {
             if (input.isAtField(FieldNames.basicInfo)) {
               if (!input.trySkipNullValue()) {
                 input.readMessage(basicInfo);
-                bitField0_ |= 0x00000004;
+                bitField0_ |= 0x00000002;
               }
             } else {
               input.skipUnknownField();
@@ -1202,6 +1190,18 @@ public final class PlayerSyncScNotifyOuterClass {
             if (input.isAtField(FieldNames.missionSync)) {
               if (!input.trySkipNullValue()) {
                 input.readMessage(missionSync);
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case -403178604:
+          case 397279681: {
+            if (input.isAtField(FieldNames.avatarSync)) {
+              if (!input.trySkipNullValue()) {
+                input.readMessage(avatarSync);
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -1221,11 +1221,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_ |= 0x00000020;
               }
             } else {
@@ -1233,11 +1233,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_ |= 0x00000040;
               }
             } else {
@@ -1245,35 +1245,35 @@ public final class PlayerSyncScNotifyOuterClass {
             }
             break;
           }
-          case 204814001:
-          case 2071893482: {
-            if (input.isAtField(FieldNames.relicList)) {
-              if (!input.trySkipNullValue()) {
-                input.readRepeatedMessage(relicList);
-                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 2007143244:
           case 2109525167: {
             if (input.isAtField(FieldNames.equipmentList)) {
               if (!input.trySkipNullValue()) {
                 input.readRepeatedMessage(equipmentList);
+                bitField0_ |= 0x00000080;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 204814001:
+          case 2071893482: {
+            if (input.isAtField(FieldNames.relicList)) {
+              if (!input.trySkipNullValue()) {
+                input.readRepeatedMessage(relicList);
+                bitField0_ |= 0x00000100;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case -2115854747:
+          case -1149360970: {
+            if (input.isAtField(FieldNames.materialList)) {
+              if (!input.trySkipNullValue()) {
+                input.readRepeatedMessage(materialList);
                 bitField0_ |= 0x00000200;
               }
             } else {
@@ -1348,24 +1348,24 @@ 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 missionSync = FieldName.forField("missionSync", "mission_sync");
 
+      static final FieldName avatarSync = FieldName.forField("avatarSync", "avatar_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 delRelicList = FieldName.forField("delRelicList", "del_relic_list");
+      static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list");
 
       static final FieldName relicList = FieldName.forField("relicList", "relic_list");
 
       static final FieldName materialList = FieldName.forField("materialList", "material_list");
 
-      static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list");
-
       static final FieldName multiPathAvatarInfoList = FieldName.forField("multiPathAvatarInfoList", "multi_path_avatar_info_list");
     }
   }
diff --git a/src/generated/main/emu/lunarcore/proto/PlayingStateOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayingStateOuterClass.java
index 4b36071..c3ef7c4 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayingStateOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayingStateOuterClass.java
@@ -117,7 +117,7 @@ public final class PlayingStateOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return PlayingStateConverter.INSTANCE;
     }
 
@@ -139,7 +139,7 @@ public final class PlayingStateOuterClass {
       return value == null ? other : value;
     }
 
-    enum PlayingStateConverter implements EnumConverter {
+    enum PlayingStateConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       private static final PlayingState[] lookup = new PlayingState[8];
diff --git a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java
index c632c0a..27e8dd3 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 = 11;
+     * optional uint32 base_avatar_id = 1;
      */
     private int baseAvatarId;
 
     /**
-     * repeated .ItemCost item_list = 4;
+     * repeated .ItemCost item_list = 6;
      */
     private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory());
 
@@ -40,7 +40,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 base_avatar_id = 11;
+     * optional uint32 base_avatar_id = 1;
      * @return whether the baseAvatarId field is set
      */
     public boolean hasBaseAvatarId() {
@@ -48,7 +48,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 base_avatar_id = 11;
+     * optional uint32 base_avatar_id = 1;
      * @return this
      */
     public PromoteAvatarCsReq clearBaseAvatarId() {
@@ -58,7 +58,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 base_avatar_id = 11;
+     * optional uint32 base_avatar_id = 1;
      * @return the baseAvatarId
      */
     public int getBaseAvatarId() {
@@ -66,7 +66,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 base_avatar_id = 11;
+     * optional uint32 base_avatar_id = 1;
      * @param value the baseAvatarId to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 4;
+     * repeated .ItemCost item_list = 6;
      * @return whether the itemList field is set
      */
     public boolean hasItemList() {
@@ -85,7 +85,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 4;
+     * repeated .ItemCost item_list = 6;
      * @return this
      */
     public PromoteAvatarCsReq clearItemList() {
@@ -95,7 +95,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 4;
+     * repeated .ItemCost item_list = 6;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 4;
+     * repeated .ItemCost item_list = 6;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 4;
+     * repeated .ItemCost item_list = 6;
      * @param value the itemList to add
      * @return this
      */
@@ -134,7 +134,7 @@ public final class PromoteAvatarCsReqOuterClass {
     }
 
     /**
-     * repeated .ItemCost item_list = 4;
+     * repeated .ItemCost item_list = 6;
      * @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) 88);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(baseAvatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < itemList.length(); i++) {
-          output.writeRawByte((byte) 34);
+          output.writeRawByte((byte) 50);
           output.writeMessageNoTag(itemList.get(i));
         }
       }
@@ -240,16 +240,16 @@ public final class PromoteAvatarCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 88: {
+          case 8: {
             // baseAvatarId
             baseAvatarId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 34) {
+            if (tag != 50) {
               break;
             }
           }
-          case 34: {
+          case 50: {
             // 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 40f07bd..44eaae2 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 = 13;
+     * optional uint32 equipment_unique_id = 11;
      */
     private int equipmentUniqueId;
 
     /**
-     * optional .ItemCostList item_cost_list = 14;
+     * optional .ItemCostList item_cost_list = 15;
      */
     private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
 
@@ -39,7 +39,7 @@ public final class PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 13;
+     * optional uint32 equipment_unique_id = 11;
      * @return whether the equipmentUniqueId field is set
      */
     public boolean hasEquipmentUniqueId() {
@@ -47,7 +47,7 @@ public final class PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 13;
+     * optional uint32 equipment_unique_id = 11;
      * @return this
      */
     public PromoteEquipmentCsReq clearEquipmentUniqueId() {
@@ -57,7 +57,7 @@ public final class PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 13;
+     * optional uint32 equipment_unique_id = 11;
      * @return the equipmentUniqueId
      */
     public int getEquipmentUniqueId() {
@@ -65,7 +65,7 @@ public final class PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 13;
+     * optional uint32 equipment_unique_id = 11;
      * @param value the equipmentUniqueId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 14;
+     * optional .ItemCostList item_cost_list = 15;
      * @return whether the itemCostList field is set
      */
     public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 14;
+     * optional .ItemCostList item_cost_list = 15;
      * @return this
      */
     public PromoteEquipmentCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 14;
+     * 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 PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 14;
+     * 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 PromoteEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 14;
+     * optional .ItemCostList item_cost_list = 15;
      * @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) 104);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(equipmentUniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 114);
+        output.writeRawByte((byte) 122);
         output.writeMessageNoTag(itemCostList);
       }
     }
@@ -226,16 +226,16 @@ public final class PromoteEquipmentCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 104: {
+          case 88: {
             // equipmentUniqueId
             equipmentUniqueId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 114) {
+            if (tag != 122) {
               break;
             }
           }
-          case 114: {
+          case 122: {
             // 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 8719b86..f367a34 100644
--- a/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java
@@ -19,19 +19,19 @@ public final class PropAeonInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 add_exp = 1;
+     * optional uint32 aeon_id = 3;
      */
-    private int addExp;
+    private int aeonId;
 
     /**
-     * optional uint32 dialogue_group_id = 5;
+     * optional uint32 dialogue_group_id = 10;
      */
     private int dialogueGroupId;
 
     /**
-     * optional uint32 aeon_id = 13;
+     * optional uint32 add_exp = 14;
      */
-    private int aeonId;
+    private int addExp;
 
     private PropAeonInfo() {
     }
@@ -44,44 +44,44 @@ public final class PropAeonInfoOuterClass {
     }
 
     /**
-     * optional uint32 add_exp = 1;
-     * @return whether the addExp field is set
+     * optional uint32 aeon_id = 3;
+     * @return whether the aeonId field is set
      */
-    public boolean hasAddExp() {
+    public boolean hasAeonId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 add_exp = 1;
+     * optional uint32 aeon_id = 3;
      * @return this
      */
-    public PropAeonInfo clearAddExp() {
+    public PropAeonInfo clearAeonId() {
       bitField0_ &= ~0x00000001;
-      addExp = 0;
+      aeonId = 0;
       return this;
     }
 
     /**
-     * optional uint32 add_exp = 1;
-     * @return the addExp
+     * optional uint32 aeon_id = 3;
+     * @return the aeonId
      */
-    public int getAddExp() {
-      return addExp;
+    public int getAeonId() {
+      return aeonId;
     }
 
     /**
-     * optional uint32 add_exp = 1;
-     * @param value the addExp to set
+     * optional uint32 aeon_id = 3;
+     * @param value the aeonId to set
      * @return this
      */
-    public PropAeonInfo setAddExp(final int value) {
+    public PropAeonInfo setAeonId(final int value) {
       bitField0_ |= 0x00000001;
-      addExp = value;
+      aeonId = value;
       return this;
     }
 
     /**
-     * optional uint32 dialogue_group_id = 5;
+     * optional uint32 dialogue_group_id = 10;
      * @return whether the dialogueGroupId field is set
      */
     public boolean hasDialogueGroupId() {
@@ -89,7 +89,7 @@ public final class PropAeonInfoOuterClass {
     }
 
     /**
-     * optional uint32 dialogue_group_id = 5;
+     * optional uint32 dialogue_group_id = 10;
      * @return this
      */
     public PropAeonInfo clearDialogueGroupId() {
@@ -99,7 +99,7 @@ public final class PropAeonInfoOuterClass {
     }
 
     /**
-     * optional uint32 dialogue_group_id = 5;
+     * optional uint32 dialogue_group_id = 10;
      * @return the dialogueGroupId
      */
     public int getDialogueGroupId() {
@@ -107,7 +107,7 @@ public final class PropAeonInfoOuterClass {
     }
 
     /**
-     * optional uint32 dialogue_group_id = 5;
+     * optional uint32 dialogue_group_id = 10;
      * @param value the dialogueGroupId to set
      * @return this
      */
@@ -118,39 +118,39 @@ public final class PropAeonInfoOuterClass {
     }
 
     /**
-     * optional uint32 aeon_id = 13;
-     * @return whether the aeonId field is set
+     * optional uint32 add_exp = 14;
+     * @return whether the addExp field is set
      */
-    public boolean hasAeonId() {
+    public boolean hasAddExp() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * optional uint32 aeon_id = 13;
+     * optional uint32 add_exp = 14;
      * @return this
      */
-    public PropAeonInfo clearAeonId() {
+    public PropAeonInfo clearAddExp() {
       bitField0_ &= ~0x00000004;
-      aeonId = 0;
+      addExp = 0;
       return this;
     }
 
     /**
-     * optional uint32 aeon_id = 13;
-     * @return the aeonId
+     * optional uint32 add_exp = 14;
+     * @return the addExp
      */
-    public int getAeonId() {
-      return aeonId;
+    public int getAddExp() {
+      return addExp;
     }
 
     /**
-     * optional uint32 aeon_id = 13;
-     * @param value the aeonId to set
+     * optional uint32 add_exp = 14;
+     * @param value the addExp to set
      * @return this
      */
-    public PropAeonInfo setAeonId(final int value) {
+    public PropAeonInfo setAddExp(final int value) {
       bitField0_ |= 0x00000004;
-      aeonId = value;
+      addExp = value;
       return this;
     }
 
@@ -159,9 +159,9 @@ public final class PropAeonInfoOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        addExp = other.addExp;
-        dialogueGroupId = other.dialogueGroupId;
         aeonId = other.aeonId;
+        dialogueGroupId = other.dialogueGroupId;
+        addExp = other.addExp;
       }
       return this;
     }
@@ -172,14 +172,14 @@ public final class PropAeonInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasAddExp()) {
-        setAddExp(other.addExp);
+      if (other.hasAeonId()) {
+        setAeonId(other.aeonId);
       }
       if (other.hasDialogueGroupId()) {
         setDialogueGroupId(other.dialogueGroupId);
       }
-      if (other.hasAeonId()) {
-        setAeonId(other.aeonId);
+      if (other.hasAddExp()) {
+        setAddExp(other.addExp);
       }
       return this;
     }
@@ -191,9 +191,9 @@ public final class PropAeonInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      addExp = 0;
-      dialogueGroupId = 0;
       aeonId = 0;
+      dialogueGroupId = 0;
+      addExp = 0;
       return this;
     }
 
@@ -217,24 +217,24 @@ public final class PropAeonInfoOuterClass {
       }
       PropAeonInfo other = (PropAeonInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasAddExp() || addExp == other.addExp)
+        && (!hasAeonId() || aeonId == other.aeonId)
         && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId)
-        && (!hasAeonId() || aeonId == other.aeonId);
+        && (!hasAddExp() || addExp == other.addExp);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeUInt32NoTag(addExp);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(aeonId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(dialogueGroupId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 104);
-        output.writeUInt32NoTag(aeonId);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(addExp);
       }
     }
 
@@ -242,13 +242,13 @@ public final class PropAeonInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(addExp);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(addExp);
       }
       return size;
     }
@@ -260,27 +260,27 @@ public final class PropAeonInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
-            // addExp
-            addExp = input.readUInt32();
+          case 24: {
+            // aeonId
+            aeonId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 40) {
+            if (tag != 80) {
               break;
             }
           }
-          case 40: {
+          case 80: {
             // dialogueGroupId
             dialogueGroupId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 112) {
               break;
             }
           }
-          case 104: {
-            // aeonId
-            aeonId = input.readUInt32();
+          case 112: {
+            // addExp
+            addExp = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 0) {
@@ -305,13 +305,13 @@ public final class PropAeonInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.addExp, addExp);
+        output.writeUInt32(FieldNames.aeonId, aeonId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.aeonId, aeonId);
+        output.writeUInt32(FieldNames.addExp, addExp);
       }
       output.endObject();
     }
@@ -323,11 +323,11 @@ public final class PropAeonInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -1422538308:
-          case -1148257921: {
-            if (input.isAtField(FieldNames.addExp)) {
+          case -1421249154:
+          case -1109029417: {
+            if (input.isAtField(FieldNames.aeonId)) {
               if (!input.trySkipNullValue()) {
-                addExp = input.readUInt32();
+                aeonId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -347,11 +347,11 @@ public final class PropAeonInfoOuterClass {
             }
             break;
           }
-          case -1421249154:
-          case -1109029417: {
-            if (input.isAtField(FieldNames.aeonId)) {
+          case -1422538308:
+          case -1148257921: {
+            if (input.isAtField(FieldNames.addExp)) {
               if (!input.trySkipNullValue()) {
-                aeonId = input.readUInt32();
+                addExp = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -411,11 +411,11 @@ public final class PropAeonInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName addExp = FieldName.forField("addExp", "add_exp");
+      static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id");
 
       static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id");
 
-      static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id");
+      static final FieldName addExp = FieldName.forField("addExp", "add_exp");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java
index da9c9ee..06bcf08 100644
--- a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java
@@ -20,11 +20,11 @@ public final class PropExtraInfoOuterClass {
 
     /**
      * 
-     *  PropAeonInfo aeon_info = 9;
+     *  PropAeonInfo aeon_info = 7;
      *  PropChessInfo chess_rogue_info = 8;
      * 

      *
-     * optional .PropRogueInfo rogue_info = 11;
+     * optional .PropRogueInfo rogue_info = 10;
      */
     private final PropRogueInfoOuterClass.PropRogueInfo rogueInfo = PropRogueInfoOuterClass.PropRogueInfo.newInstance();
 
@@ -51,11 +51,11 @@ public final class PropExtraInfoOuterClass {
 
     /**
      * 
-     *  PropAeonInfo aeon_info = 9;
+     *  PropAeonInfo aeon_info = 7;
      *  PropChessInfo chess_rogue_info = 8;
      * 

      *
-     * optional .PropRogueInfo rogue_info = 11;
+     * optional .PropRogueInfo rogue_info = 10;
      * @return whether the rogueInfo field is set
      */
     public boolean hasRogueInfo() {
@@ -64,11 +64,11 @@ public final class PropExtraInfoOuterClass {
 
     /**
      * 
-     *  PropAeonInfo aeon_info = 9;
+     *  PropAeonInfo aeon_info = 7;
      *  PropChessInfo chess_rogue_info = 8;
      * 

      *
-     * optional .PropRogueInfo rogue_info = 11;
+     * optional .PropRogueInfo rogue_info = 10;
      * @return this
      */
     public PropExtraInfo clearRogueInfo() {
@@ -79,11 +79,11 @@ public final class PropExtraInfoOuterClass {
 
     /**
      * 
-     *  PropAeonInfo aeon_info = 9;
+     *  PropAeonInfo aeon_info = 7;
      *  PropChessInfo chess_rogue_info = 8;
      * 

      *
-     * optional .PropRogueInfo rogue_info = 11;
+     * optional .PropRogueInfo rogue_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.
@@ -98,11 +98,11 @@ public final class PropExtraInfoOuterClass {
 
     /**
      * 
-     *  PropAeonInfo aeon_info = 9;
+     *  PropAeonInfo aeon_info = 7;
      *  PropChessInfo chess_rogue_info = 8;
      * 

      *
-     * optional .PropRogueInfo rogue_info = 11;
+     * optional .PropRogueInfo rogue_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
@@ -117,11 +117,11 @@ public final class PropExtraInfoOuterClass {
 
     /**
      * 
-     *  PropAeonInfo aeon_info = 9;
+     *  PropAeonInfo aeon_info = 7;
      *  PropChessInfo chess_rogue_info = 8;
      * 

      *
-     * optional .PropRogueInfo rogue_info = 11;
+     * optional .PropRogueInfo rogue_info = 10;
      * @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) 82);
         output.writeMessageNoTag(rogueInfo);
       }
     }
@@ -212,7 +212,7 @@ public final class PropExtraInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 90: {
+          case 82: {
             // 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 9054e13..79daf2c 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 = 4;
      */
     private int siteId;
 
     /**
-     * optional uint32 room_id = 8;
+     * optional uint32 room_id = 7;
      */
     private int roomId;
 
@@ -39,7 +39,7 @@ public final class PropRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 site_id = 6;
+     * optional uint32 site_id = 4;
      * @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 = 4;
      * @return this
      */
     public PropRogueInfo clearSiteId() {
@@ -57,7 +57,7 @@ public final class PropRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 site_id = 6;
+     * optional uint32 site_id = 4;
      * @return the siteId
      */
     public int getSiteId() {
@@ -65,7 +65,7 @@ public final class PropRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 site_id = 6;
+     * optional uint32 site_id = 4;
      * @param value the siteId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class PropRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 room_id = 8;
+     * optional uint32 room_id = 7;
      * @return whether the roomId field is set
      */
     public boolean hasRoomId() {
@@ -84,7 +84,7 @@ public final class PropRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 room_id = 8;
+     * optional uint32 room_id = 7;
      * @return this
      */
     public PropRogueInfo clearRoomId() {
@@ -94,7 +94,7 @@ public final class PropRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 room_id = 8;
+     * optional uint32 room_id = 7;
      * @return the roomId
      */
     public int getRoomId() {
@@ -102,7 +102,7 @@ public final class PropRogueInfoOuterClass {
     }
 
     /**
-     * optional uint32 room_id = 8;
+     * optional uint32 room_id = 7;
      * @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) 32);
         output.writeUInt32NoTag(siteId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 56);
         output.writeUInt32NoTag(roomId);
       }
     }
@@ -205,16 +205,16 @@ public final class PropRogueInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
+          case 32: {
             // siteId
             siteId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 56) {
               break;
             }
           }
-          case 64: {
+          case 56: {
             // 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 33e9653..adec78d 100644
--- a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java
@@ -19,7 +19,7 @@ public final class QuestOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional int64 finish_time = 4;
+     * optional int64 finish_time = 13;
      */
     private long finishTime;
 
@@ -29,12 +29,12 @@ public final class QuestOuterClass {
     private int progress;
 
     /**
-     * optional uint32 id = 15;
+     * optional uint32 id = 10;
      */
     private int id;
 
     /**
-     * optional .QuestStatus status = 8;
+     * optional .QuestStatus status = 15;
      */
     private int status;
 
@@ -49,7 +49,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional int64 finish_time = 4;
+     * optional int64 finish_time = 13;
      * @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 = 13;
      * @return this
      */
     public Quest clearFinishTime() {
@@ -67,7 +67,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional int64 finish_time = 4;
+     * optional int64 finish_time = 13;
      * @return the finishTime
      */
     public long getFinishTime() {
@@ -75,7 +75,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional int64 finish_time = 4;
+     * optional int64 finish_time = 13;
      * @param value the finishTime to set
      * @return this
      */
@@ -123,7 +123,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional uint32 id = 15;
+     * optional uint32 id = 10;
      * @return whether the id field is set
      */
     public boolean hasId() {
@@ -131,7 +131,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional uint32 id = 15;
+     * optional uint32 id = 10;
      * @return this
      */
     public Quest clearId() {
@@ -141,7 +141,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional uint32 id = 15;
+     * optional uint32 id = 10;
      * @return the id
      */
     public int getId() {
@@ -149,7 +149,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional uint32 id = 15;
+     * optional uint32 id = 10;
      * @param value the id to set
      * @return this
      */
@@ -160,7 +160,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional .QuestStatus status = 8;
+     * optional .QuestStatus status = 15;
      * @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 = 15;
      * @return this
      */
     public Quest clearStatus() {
@@ -178,7 +178,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional .QuestStatus status = 8;
+     * optional .QuestStatus status = 15;
      * @return the status
      */
     public QuestStatusOuterClass.QuestStatus getStatus() {
@@ -211,7 +211,7 @@ public final class QuestOuterClass {
     }
 
     /**
-     * optional .QuestStatus status = 8;
+     * optional .QuestStatus status = 15;
      * @param value the status to set
      * @return this
      */
@@ -298,7 +298,7 @@ public final class QuestOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 104);
         output.writeInt64NoTag(finishTime);
       }
       if ((bitField0_ & 0x00000002) != 0) {
@@ -306,11 +306,11 @@ public final class QuestOuterClass {
         output.writeUInt32NoTag(progress);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(id);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 120);
         output.writeEnumNoTag(status);
       }
     }
@@ -340,7 +340,7 @@ public final class QuestOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
+          case 104: {
             // finishTime
             finishTime = input.readInt64();
             bitField0_ |= 0x00000001;
@@ -354,20 +354,20 @@ public final class QuestOuterClass {
             progress = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
+            if (tag != 80) {
+              break;
+            }
+          }
+          case 80: {
+            // id
+            id = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
             if (tag != 120) {
               break;
             }
           }
           case 120: {
-            // id
-            id = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 64) {
-              break;
-            }
-          }
-          case 64: {
             // status
             final int value = input.readInt32();
             if (QuestStatusOuterClass.QuestStatus.forNumber(value) != null) {
diff --git a/src/generated/main/emu/lunarcore/proto/QuestStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuestStatusOuterClass.java
index 4a8066e..985c275 100644
--- a/src/generated/main/emu/lunarcore/proto/QuestStatusOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/QuestStatusOuterClass.java
@@ -87,7 +87,7 @@ public final class QuestStatusOuterClass {
     /**
      * @return a converter that maps between this enum's numeric and text representations
      */
-    public static EnumConverter converter() {
+    public static ProtoEnum.EnumConverter converter() {
       return QuestStatusConverter.INSTANCE;
     }
 
@@ -109,7 +109,7 @@ public final class QuestStatusOuterClass {
       return value == null ? other : value;
     }
 
-    enum QuestStatusConverter implements EnumConverter {
+    enum QuestStatusConverter implements ProtoEnum.EnumConverter {
       INSTANCE;
 
       private static final QuestStatus[] lookup = new QuestStatus[5];
diff --git a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java
index 79db44e..437b4c9 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 base_avatar_id = 6;
-     */
-    private int baseAvatarId;
-
-    /**
-     * optional uint32 index = 8;
-     */
-    private int index;
-
-    /**
-     * optional uint32 plane_id = 15;
+     * optional uint32 plane_id = 4;
      */
     private int planeId;
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 4;
+     * optional uint32 base_avatar_id = 8;
      */
-    private int extraLineupType;
+    private int baseAvatarId;
 
     /**
-     * optional .AvatarType avatar_type = 12;
+     * optional uint32 index = 14;
+     */
+    private int index;
+
+    /**
+     * optional .AvatarType avatar_type = 10;
      */
     private int avatarType;
 
     /**
-     * optional bool is_virtual = 2;
+     * optional .ExtraLineupType extra_lineup_type = 11;
+     */
+    private int extraLineupType;
+
+    /**
+     * optional bool is_virtual = 7;
      */
     private boolean isVirtual;
 
@@ -59,99 +59,25 @@ public final class QuitLineupCsReqOuterClass {
     }
 
     /**
-     * optional uint32 base_avatar_id = 6;
-     * @return whether the baseAvatarId field is set
+     * optional uint32 plane_id = 4;
+     * @return whether the planeId field is set
      */
-    public boolean hasBaseAvatarId() {
+    public boolean hasPlaneId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 base_avatar_id = 6;
-     * @return this
-     */
-    public QuitLineupCsReq 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 QuitLineupCsReq setBaseAvatarId(final int value) {
-      bitField0_ |= 0x00000001;
-      baseAvatarId = 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;
-     * @return this
-     */
-    public QuitLineupCsReq clearIndex() {
-      bitField0_ &= ~0x00000002;
-      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 QuitLineupCsReq setIndex(final int value) {
-      bitField0_ |= 0x00000002;
-      index = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 plane_id = 15;
-     * @return whether the planeId field is set
-     */
-    public boolean hasPlaneId() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * optional uint32 plane_id = 15;
+     * optional uint32 plane_id = 4;
      * @return this
      */
     public QuitLineupCsReq clearPlaneId() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000001;
       planeId = 0;
       return this;
     }
 
     /**
-     * optional uint32 plane_id = 15;
+     * optional uint32 plane_id = 4;
      * @return the planeId
      */
     public int getPlaneId() {
@@ -159,99 +85,110 @@ public final class QuitLineupCsReqOuterClass {
     }
 
     /**
-     * optional uint32 plane_id = 15;
+     * optional uint32 plane_id = 4;
      * @param value the planeId to set
      * @return this
      */
     public QuitLineupCsReq setPlaneId(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000001;
       planeId = value;
       return this;
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 4;
-     * @return whether the extraLineupType field is set
+     * optional uint32 base_avatar_id = 8;
+     * @return whether the baseAvatarId field is set
      */
-    public boolean hasExtraLineupType() {
+    public boolean hasBaseAvatarId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 base_avatar_id = 8;
+     * @return this
+     */
+    public QuitLineupCsReq 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 QuitLineupCsReq setBaseAvatarId(final int value) {
+      bitField0_ |= 0x00000002;
+      baseAvatarId = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 index = 14;
+     * @return whether the index field is set
+     */
+    public boolean hasIndex() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * optional uint32 index = 14;
+     * @return this
+     */
+    public QuitLineupCsReq clearIndex() {
+      bitField0_ &= ~0x00000004;
+      index = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 index = 14;
+     * @return the index
+     */
+    public int getIndex() {
+      return index;
+    }
+
+    /**
+     * optional uint32 index = 14;
+     * @param value the index to set
+     * @return this
+     */
+    public QuitLineupCsReq setIndex(final int value) {
+      bitField0_ |= 0x00000004;
+      index = value;
+      return this;
+    }
+
+    /**
+     * optional .AvatarType avatar_type = 10;
+     * @return whether the avatarType field is set
+     */
+    public boolean hasAvatarType() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 4;
-     * @return this
-     */
-    public QuitLineupCsReq clearExtraLineupType() {
-      bitField0_ &= ~0x00000008;
-      extraLineupType = 0;
-      return this;
-    }
-
-    /**
-     * optional .ExtraLineupType extra_lineup_type = 4;
-     * @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 = 4;
-     * @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 = 12;
-     * @return whether the avatarType field is set
-     */
-    public boolean hasAvatarType() {
-      return (bitField0_ & 0x00000010) != 0;
-    }
-
-    /**
-     * optional .AvatarType avatar_type = 12;
+     * optional .AvatarType avatar_type = 10;
      * @return this
      */
     public QuitLineupCsReq clearAvatarType() {
-      bitField0_ &= ~0x00000010;
+      bitField0_ &= ~0x00000008;
       avatarType = 0;
       return this;
     }
 
     /**
-     * optional .AvatarType avatar_type = 12;
+     * optional .AvatarType avatar_type = 10;
      * @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 = 12;
+     * optional .AvatarType avatar_type = 10;
      * @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 = 2;
+     * optional .ExtraLineupType extra_lineup_type = 11;
+     * @return whether the extraLineupType field is set
+     */
+    public boolean hasExtraLineupType() {
+      return (bitField0_ & 0x00000010) != 0;
+    }
+
+    /**
+     * optional .ExtraLineupType extra_lineup_type = 11;
+     * @return this
+     */
+    public QuitLineupCsReq clearExtraLineupType() {
+      bitField0_ &= ~0x00000010;
+      extraLineupType = 0;
+      return this;
+    }
+
+    /**
+     * optional .ExtraLineupType extra_lineup_type = 11;
+     * @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 = 11;
+     * @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 = 7;
      * @return whether the isVirtual field is set
      */
     public boolean hasIsVirtual() {
@@ -303,7 +303,7 @@ public final class QuitLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 2;
+     * optional bool is_virtual = 7;
      * @return this
      */
     public QuitLineupCsReq clearIsVirtual() {
@@ -313,7 +313,7 @@ public final class QuitLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 2;
+     * optional bool is_virtual = 7;
      * @return the isVirtual
      */
     public boolean getIsVirtual() {
@@ -321,7 +321,7 @@ public final class QuitLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 2;
+     * optional bool is_virtual = 7;
      * @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;
-        planeId = other.planeId;
-        extraLineupType = other.extraLineupType;
         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.hasPlaneId()) {
-        setPlaneId(other.planeId);
+      if (other.hasAvatarType()) {
+        setAvatarTypeValue(other.avatarType);
       }
       if (other.hasExtraLineupType()) {
         setExtraLineupTypeValue(other.extraLineupType);
       }
-      if (other.hasAvatarType()) {
-        setAvatarTypeValue(other.avatarType);
-      }
       if (other.hasIsVirtual()) {
         setIsVirtual(other.isVirtual);
       }
@@ -380,11 +380,11 @@ public final class QuitLineupCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
+      planeId = 0;
       baseAvatarId = 0;
       index = 0;
-      planeId = 0;
-      extraLineupType = 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)
-        && (!hasPlaneId() || planeId == other.planeId)
-        && (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
         && (!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(baseAvatarId);
+        output.writeRawByte((byte) 32);
+        output.writeUInt32NoTag(planeId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeRawByte((byte) 64);
-        output.writeUInt32NoTag(index);
+        output.writeUInt32NoTag(baseAvatarId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 120);
-        output.writeUInt32NoTag(planeId);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(index);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeEnumNoTag(extraLineupType);
-      }
-      if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 80);
         output.writeEnumNoTag(avatarType);
       }
+      if ((bitField0_ & 0x00000010) != 0) {
+        output.writeRawByte((byte) 88);
+        output.writeEnumNoTag(extraLineupType);
+      }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 56);
         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(baseAvatarId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
+      }
       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,9 +476,9 @@ public final class QuitLineupCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
-            // baseAvatarId
-            baseAvatarId = input.readUInt32();
+          case 32: {
+            // planeId
+            planeId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
             if (tag != 64) {
@@ -486,48 +486,48 @@ public final class QuitLineupCsReqOuterClass {
             }
           }
           case 64: {
-            // index
-            index = input.readUInt32();
+            // baseAvatarId
+            baseAvatarId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 112) {
               break;
             }
           }
-          case 120: {
-            // planeId
-            planeId = input.readUInt32();
+          case 112: {
+            // index
+            index = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 80) {
               break;
             }
           }
-          case 32: {
-            // extraLineupType
-            final int value = input.readInt32();
-            if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
-              extraLineupType = value;
-              bitField0_ |= 0x00000008;
-            }
-            tag = input.readTag();
-            if (tag != 96) {
-              break;
-            }
-          }
-          case 96: {
+          case 80: {
             // avatarType
             final int value = input.readInt32();
             if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
               avatarType = value;
-              bitField0_ |= 0x00000010;
+              bitField0_ |= 0x00000008;
             }
             tag = input.readTag();
-            if (tag != 16) {
+            if (tag != 88) {
               break;
             }
           }
-          case 16: {
+          case 88: {
+            // extraLineupType
+            final int value = input.readInt32();
+            if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
+              extraLineupType = value;
+              bitField0_ |= 0x00000010;
+            }
+            tag = input.readTag();
+            if (tag != 56) {
+              break;
+            }
+          }
+          case 56: {
             // 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.baseAvatarId, baseAvatarId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.index, index);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.planeId, planeId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeUInt32(FieldNames.index, index);
+      }
       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,12 +581,24 @@ 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_ |= 0x00000001;
+                bitField0_ |= 0x00000002;
               }
             } else {
               input.skipUnknownField();
@@ -597,18 +609,6 @@ public final class QuitLineupCsReqOuterClass {
             if (input.isAtField(FieldNames.index)) {
               if (!input.trySkipNullValue()) {
                 index = input.readUInt32();
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case -493896553:
-          case 1869097438: {
-            if (input.isAtField(FieldNames.planeId)) {
-              if (!input.trySkipNullValue()) {
-                planeId = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -616,23 +616,6 @@ public final class QuitLineupCsReqOuterClass {
             }
             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_ |= 0x00000008;
-                } else {
-                  input.skipUnknownEnumValue();
-                }
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case -403148749:
           case 397309536: {
             if (input.isAtField(FieldNames.avatarType)) {
@@ -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 planeId = FieldName.forField("planeId", "plane_id");
+      static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
 
       static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
 
-      static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
-
       static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual");
     }
   }
diff --git a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java
index 11e7d78..2c369a9 100644
--- a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java
@@ -19,17 +19,17 @@ public final class RankUpAvatarCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 rank = 1;
+     * optional uint32 rank = 6;
      */
     private int rank;
 
     /**
-     * optional uint32 avatar_id = 12;
+     * optional uint32 avatar_id = 14;
      */
     private int avatarId;
 
     /**
-     * optional .ItemCostList item_cost_list = 2;
+     * optional .ItemCostList item_cost_list = 8;
      */
     private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
 
@@ -44,7 +44,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 rank = 1;
+     * optional uint32 rank = 6;
      * @return whether the rank field is set
      */
     public boolean hasRank() {
@@ -52,7 +52,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 rank = 1;
+     * optional uint32 rank = 6;
      * @return this
      */
     public RankUpAvatarCsReq clearRank() {
@@ -62,7 +62,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 rank = 1;
+     * optional uint32 rank = 6;
      * @return the rank
      */
     public int getRank() {
@@ -70,7 +70,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 rank = 1;
+     * optional uint32 rank = 6;
      * @param value the rank to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 12;
+     * optional uint32 avatar_id = 14;
      * @return whether the avatarId field is set
      */
     public boolean hasAvatarId() {
@@ -89,7 +89,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 12;
+     * optional uint32 avatar_id = 14;
      * @return this
      */
     public RankUpAvatarCsReq clearAvatarId() {
@@ -99,7 +99,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 12;
+     * optional uint32 avatar_id = 14;
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -107,7 +107,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 12;
+     * optional uint32 avatar_id = 14;
      * @param value the avatarId to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 2;
+     * optional .ItemCostList item_cost_list = 8;
      * @return whether the itemCostList field is set
      */
     public boolean hasItemCostList() {
@@ -126,7 +126,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 2;
+     * optional .ItemCostList item_cost_list = 8;
      * @return this
      */
     public RankUpAvatarCsReq clearItemCostList() {
@@ -136,7 +136,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * 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.
@@ -150,7 +150,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * 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
@@ -164,7 +164,7 @@ public final class RankUpAvatarCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 2;
+     * optional .ItemCostList item_cost_list = 8;
      * @param value the itemCostList to set
      * @return this
      */
@@ -246,15 +246,15 @@ public final class RankUpAvatarCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(rank);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 112);
         output.writeUInt32NoTag(avatarId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 18);
+        output.writeRawByte((byte) 66);
         output.writeMessageNoTag(itemCostList);
       }
     }
@@ -281,25 +281,25 @@ public final class RankUpAvatarCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
+          case 48: {
             // rank
             rank = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 112) {
               break;
             }
           }
-          case 96: {
+          case 112: {
             // avatarId
             avatarId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 18) {
+            if (tag != 66) {
               break;
             }
           }
-          case 18: {
+          case 66: {
             // itemCostList
             input.readMessage(itemCostList);
             bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java
index 1ce7d1e..fe3aa8b 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 = 12;
+     * optional uint32 equipment_unique_id = 7;
      */
     private int equipmentUniqueId;
 
     /**
-     * optional .ItemCostList item_cost_list = 4;
+     * optional .ItemCostList item_cost_list = 8;
      */
     private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
 
@@ -39,7 +39,7 @@ public final class RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 12;
+     * optional uint32 equipment_unique_id = 7;
      * @return whether the equipmentUniqueId field is set
      */
     public boolean hasEquipmentUniqueId() {
@@ -47,7 +47,7 @@ public final class RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 12;
+     * optional uint32 equipment_unique_id = 7;
      * @return this
      */
     public RankUpEquipmentCsReq clearEquipmentUniqueId() {
@@ -57,7 +57,7 @@ public final class RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 12;
+     * optional uint32 equipment_unique_id = 7;
      * @return the equipmentUniqueId
      */
     public int getEquipmentUniqueId() {
@@ -65,7 +65,7 @@ public final class RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional uint32 equipment_unique_id = 12;
+     * optional uint32 equipment_unique_id = 7;
      * @param value the equipmentUniqueId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 4;
+     * optional .ItemCostList item_cost_list = 8;
      * @return whether the itemCostList field is set
      */
     public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 4;
+     * optional .ItemCostList item_cost_list = 8;
      * @return this
      */
     public RankUpEquipmentCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 4;
+     * 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 RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 4;
+     * 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 RankUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * optional .ItemCostList item_cost_list = 4;
+     * optional .ItemCostList item_cost_list = 8;
      * @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) 96);
+        output.writeRawByte((byte) 56);
         output.writeUInt32NoTag(equipmentUniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 34);
+        output.writeRawByte((byte) 66);
         output.writeMessageNoTag(itemCostList);
       }
     }
@@ -226,16 +226,16 @@ public final class RankUpEquipmentCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 96: {
+          case 56: {
             // equipmentUniqueId
             equipmentUniqueId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 34) {
+            if (tag != 66) {
               break;
             }
           }
-          case 34: {
+          case 66: {
             // 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 56aa9cb..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 = 13;
+     * optional uint32 stage_id = 1;
      */
     private int stageId;
 
@@ -34,7 +34,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
     }
 
     /**
-     * optional uint32 stage_id = 13;
+     * 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 = 13;
+     * optional uint32 stage_id = 1;
      * @return this
      */
     public ReEnterLastElementStageCsReq clearStageId() {
@@ -52,7 +52,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
     }
 
     /**
-     * optional uint32 stage_id = 13;
+     * optional uint32 stage_id = 1;
      * @return the stageId
      */
     public int getStageId() {
@@ -60,7 +60,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
     }
 
     /**
-     * optional uint32 stage_id = 13;
+     * 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) 104);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(stageId);
       }
     }
@@ -150,7 +150,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 104: {
+          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 bd1bb24..aa99bd8 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 = 11;
-     */
-    private int stageId;
-
-    /**
-     * optional uint32 retcode = 15;
+     * optional uint32 retcode = 5;
      */
     private int retcode;
 
     /**
-     * optional .SceneBattleInfo battle_info = 7;
+     * optional uint32 stage_id = 6;
+     */
+    private int stageId;
+
+    /**
+     * optional .SceneBattleInfo battle_info = 13;
      */
     private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance();
 
@@ -44,62 +44,25 @@ public final class ReEnterLastElementStageScRspOuterClass {
     }
 
     /**
-     * optional uint32 stage_id = 11;
-     * @return whether the stageId field is set
+     * optional uint32 retcode = 5;
+     * @return whether the retcode field is set
      */
-    public boolean hasStageId() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 stage_id = 11;
-     * @return this
-     */
-    public ReEnterLastElementStageScRsp clearStageId() {
-      bitField0_ &= ~0x00000001;
-      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 ReEnterLastElementStageScRsp setStageId(final int value) {
-      bitField0_ |= 0x00000001;
-      stageId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 retcode = 15;
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 retcode = 15;
+     * optional uint32 retcode = 5;
      * @return this
      */
     public ReEnterLastElementStageScRsp clearRetcode() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       retcode = 0;
       return this;
     }
 
     /**
-     * optional uint32 retcode = 15;
+     * optional uint32 retcode = 5;
      * @return the retcode
      */
     public int getRetcode() {
@@ -107,18 +70,55 @@ public final class ReEnterLastElementStageScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 15;
+     * optional uint32 retcode = 5;
      * @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 = 7;
+     * optional uint32 stage_id = 6;
+     * @return whether the stageId field is set
+     */
+    public boolean hasStageId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 stage_id = 6;
+     * @return this
+     */
+    public ReEnterLastElementStageScRsp clearStageId() {
+      bitField0_ &= ~0x00000002;
+      stageId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 stage_id = 6;
+     * @return the stageId
+     */
+    public int getStageId() {
+      return stageId;
+    }
+
+    /**
+     * optional uint32 stage_id = 6;
+     * @param value the stageId to set
+     * @return this
+     */
+    public ReEnterLastElementStageScRsp setStageId(final int value) {
+      bitField0_ |= 0x00000002;
+      stageId = value;
+      return this;
+    }
+
+    /**
+     * optional .SceneBattleInfo battle_info = 13;
      * @return whether the battleInfo field is set
      */
     public boolean hasBattleInfo() {
@@ -126,7 +126,7 @@ public final class ReEnterLastElementStageScRspOuterClass {
     }
 
     /**
-     * optional .SceneBattleInfo battle_info = 7;
+     * optional .SceneBattleInfo battle_info = 13;
      * @return this
      */
     public ReEnterLastElementStageScRsp clearBattleInfo() {
@@ -136,7 +136,7 @@ public final class ReEnterLastElementStageScRspOuterClass {
     }
 
     /**
-     * optional .SceneBattleInfo battle_info = 7;
+     * optional .SceneBattleInfo battle_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 ReEnterLastElementStageScRspOuterClass {
     }
 
     /**
-     * optional .SceneBattleInfo battle_info = 7;
+     * optional .SceneBattleInfo battle_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 ReEnterLastElementStageScRspOuterClass {
     }
 
     /**
-     * optional .SceneBattleInfo battle_info = 7;
+     * optional .SceneBattleInfo battle_info = 13;
      * @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) 88);
-        output.writeUInt32NoTag(stageId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(retcode);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 48);
+        output.writeUInt32NoTag(stageId);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 58);
+        output.writeRawByte((byte) 106);
         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 88: {
-            // stageId
-            stageId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 120) {
-              break;
-            }
-          }
-          case 120: {
+          case 40: {
             // retcode
             retcode = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 58) {
+            if (tag != 48) {
               break;
             }
           }
-          case 58: {
+          case 48: {
+            // stageId
+            stageId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 106) {
+              break;
+            }
+          }
+          case 106: {
             // 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/RecallPetCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RecallPetCsReqOuterClass.java
new file mode 100644
index 0000000..3b9ec72
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/RecallPetCsReqOuterClass.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 RecallPetCsReqOuterClass {
+  /**
+   * Protobuf type {@code RecallPetCsReq}
+   */
+  public static final class RecallPetCsReq extends ProtoMessage implements Cloneable {
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * optional uint32 summoned_pet_id = 8;
+     */
+    private int summonedPetId;
+
+    private RecallPetCsReq() {
+    }
+
+    /**
+     * @return a new empty instance of {@code RecallPetCsReq}
+     */
+    public static RecallPetCsReq newInstance() {
+      return new RecallPetCsReq();
+    }
+
+    /**
+     * optional uint32 summoned_pet_id = 8;
+     * @return whether the summonedPetId field is set
+     */
+    public boolean hasSummonedPetId() {
+      return (bitField0_ & 0x00000001) != 0;
+    }
+
+    /**
+     * optional uint32 summoned_pet_id = 8;
+     * @return this
+     */
+    public RecallPetCsReq clearSummonedPetId() {
+      bitField0_ &= ~0x00000001;
+      summonedPetId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 summoned_pet_id = 8;
+     * @return the summonedPetId
+     */
+    public int getSummonedPetId() {
+      return summonedPetId;
+    }
+
+    /**
+     * optional uint32 summoned_pet_id = 8;
+     * @param value the summonedPetId to set
+     * @return this
+     */
+    public RecallPetCsReq setSummonedPetId(final int value) {
+      bitField0_ |= 0x00000001;
+      summonedPetId = value;
+      return this;
+    }
+
+    @Override
+    public RecallPetCsReq copyFrom(final RecallPetCsReq other) {
+      cachedSize = other.cachedSize;
+      if ((bitField0_ | other.bitField0_) != 0) {
+        bitField0_ = other.bitField0_;
+        summonedPetId = other.summonedPetId;
+      }
+      return this;
+    }
+
+    @Override
+    public RecallPetCsReq mergeFrom(final RecallPetCsReq other) {
+      if (other.isEmpty()) {
+        return this;
+      }
+      cachedSize = -1;
+      if (other.hasSummonedPetId()) {
+        setSummonedPetId(other.summonedPetId);
+      }
+      return this;
+    }
+
+    @Override
+    public RecallPetCsReq clear() {
+      if (isEmpty()) {
+        return this;
+      }
+      cachedSize = -1;
+      bitField0_ = 0;
+      summonedPetId = 0;
+      return this;
+    }
+
+    @Override
+    public RecallPetCsReq 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 RecallPetCsReq)) {
+        return false;
+      }
+      RecallPetCsReq other = (RecallPetCsReq) o;
+      return bitField0_ == other.bitField0_
+        && (!hasSummonedPetId() || summonedPetId == other.summonedPetId);
+    }
+
+    @Override
+    public void writeTo(final ProtoSink output) throws IOException {
+      if ((bitField0_ & 0x00000001) != 0) {
+        output.writeRawByte((byte) 64);
+        output.writeUInt32NoTag(summonedPetId);
+      }
+    }
+
+    @Override
+    protected int computeSerializedSize() {
+      int size = 0;
+      if ((bitField0_ & 0x00000001) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(summonedPetId);
+      }
+      return size;
+    }
+
+    @Override
+    @SuppressWarnings("fallthrough")
+    public RecallPetCsReq mergeFrom(final ProtoSource input) throws IOException {
+      // Enabled Fall-Through Optimization (QuickBuffers)
+      int tag = input.readTag();
+      while (true) {
+        switch (tag) {
+          case 64: {
+            // summonedPetId
+            summonedPetId = 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.summonedPetId, summonedPetId);
+      }
+      output.endObject();
+    }
+
+    @Override
+    public RecallPetCsReq mergeFrom(final JsonSource input) throws IOException {
+      if (!input.beginObject()) {
+        return this;
+      }
+      while (!input.isAtEnd()) {
+        switch (input.readFieldHash()) {
+          case -1942999750:
+          case 1818014746: {
+            if (input.isAtField(FieldNames.summonedPetId)) {
+              if (!input.trySkipNullValue()) {
+                summonedPetId = input.readUInt32();
+                bitField0_ |= 0x00000001;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          default: {
+            input.skipUnknownField();
+            break;
+          }
+        }
+      }
+      input.endObject();
+      return this;
+    }
+
+    @Override
+    public RecallPetCsReq clone() {
+      return new RecallPetCsReq().copyFrom(this);
+    }
+
+    @Override
+    public boolean isEmpty() {
+      return ((bitField0_) == 0);
+    }
+
+    public static RecallPetCsReq parseFrom(final byte[] data) throws
+        InvalidProtocolBufferException {
+      return ProtoMessage.mergeFrom(new RecallPetCsReq(), data).checkInitialized();
+    }
+
+    public static RecallPetCsReq parseFrom(final ProtoSource input) throws IOException {
+      return ProtoMessage.mergeFrom(new RecallPetCsReq(), input).checkInitialized();
+    }
+
+    public static RecallPetCsReq parseFrom(final JsonSource input) throws IOException {
+      return ProtoMessage.mergeFrom(new RecallPetCsReq(), input).checkInitialized();
+    }
+
+    /**
+     * @return factory for creating RecallPetCsReq messages
+     */
+    public static MessageFactory getFactory() {
+      return RecallPetCsReqFactory.INSTANCE;
+    }
+
+    private enum RecallPetCsReqFactory implements MessageFactory {
+      INSTANCE;
+
+      @Override
+      public RecallPetCsReq create() {
+        return RecallPetCsReq.newInstance();
+      }
+    }
+
+    /**
+     * Contains name constants used for serializing JSON
+     */
+    static class FieldNames {
+      static final FieldName summonedPetId = FieldName.forField("summonedPetId", "summoned_pet_id");
+    }
+  }
+}
diff --git a/src/generated/main/emu/lunarcore/proto/RecallPetScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RecallPetScRspOuterClass.java
new file mode 100644
index 0000000..ec04358
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/RecallPetScRspOuterClass.java
@@ -0,0 +1,420 @@
+// 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 RecallPetScRspOuterClass {
+  /**
+   * Protobuf type {@code RecallPetScRsp}
+   */
+  public static final class RecallPetScRsp extends ProtoMessage implements Cloneable {
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * optional uint32 BMCOIJCMNNC = 7;
+     */
+    private int bMCOIJCMNNC;
+
+    /**
+     * optional uint32 cur_pet_id = 13;
+     */
+    private int curPetId;
+
+    /**
+     * optional uint32 retcode = 14;
+     */
+    private int retcode;
+
+    private RecallPetScRsp() {
+    }
+
+    /**
+     * @return a new empty instance of {@code RecallPetScRsp}
+     */
+    public static RecallPetScRsp newInstance() {
+      return new RecallPetScRsp();
+    }
+
+    /**
+     * optional uint32 BMCOIJCMNNC = 7;
+     * @return whether the bMCOIJCMNNC field is set
+     */
+    public boolean hasBMCOIJCMNNC() {
+      return (bitField0_ & 0x00000001) != 0;
+    }
+
+    /**
+     * optional uint32 BMCOIJCMNNC = 7;
+     * @return this
+     */
+    public RecallPetScRsp clearBMCOIJCMNNC() {
+      bitField0_ &= ~0x00000001;
+      bMCOIJCMNNC = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 BMCOIJCMNNC = 7;
+     * @return the bMCOIJCMNNC
+     */
+    public int getBMCOIJCMNNC() {
+      return bMCOIJCMNNC;
+    }
+
+    /**
+     * optional uint32 BMCOIJCMNNC = 7;
+     * @param value the bMCOIJCMNNC to set
+     * @return this
+     */
+    public RecallPetScRsp setBMCOIJCMNNC(final int value) {
+      bitField0_ |= 0x00000001;
+      bMCOIJCMNNC = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 cur_pet_id = 13;
+     * @return whether the curPetId field is set
+     */
+    public boolean hasCurPetId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 cur_pet_id = 13;
+     * @return this
+     */
+    public RecallPetScRsp clearCurPetId() {
+      bitField0_ &= ~0x00000002;
+      curPetId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 cur_pet_id = 13;
+     * @return the curPetId
+     */
+    public int getCurPetId() {
+      return curPetId;
+    }
+
+    /**
+     * optional uint32 cur_pet_id = 13;
+     * @param value the curPetId to set
+     * @return this
+     */
+    public RecallPetScRsp setCurPetId(final int value) {
+      bitField0_ |= 0x00000002;
+      curPetId = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 retcode = 14;
+     * @return whether the retcode field is set
+     */
+    public boolean hasRetcode() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * optional uint32 retcode = 14;
+     * @return this
+     */
+    public RecallPetScRsp clearRetcode() {
+      bitField0_ &= ~0x00000004;
+      retcode = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 retcode = 14;
+     * @return the retcode
+     */
+    public int getRetcode() {
+      return retcode;
+    }
+
+    /**
+     * optional uint32 retcode = 14;
+     * @param value the retcode to set
+     * @return this
+     */
+    public RecallPetScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000004;
+      retcode = value;
+      return this;
+    }
+
+    @Override
+    public RecallPetScRsp copyFrom(final RecallPetScRsp other) {
+      cachedSize = other.cachedSize;
+      if ((bitField0_ | other.bitField0_) != 0) {
+        bitField0_ = other.bitField0_;
+        bMCOIJCMNNC = other.bMCOIJCMNNC;
+        curPetId = other.curPetId;
+        retcode = other.retcode;
+      }
+      return this;
+    }
+
+    @Override
+    public RecallPetScRsp mergeFrom(final RecallPetScRsp other) {
+      if (other.isEmpty()) {
+        return this;
+      }
+      cachedSize = -1;
+      if (other.hasBMCOIJCMNNC()) {
+        setBMCOIJCMNNC(other.bMCOIJCMNNC);
+      }
+      if (other.hasCurPetId()) {
+        setCurPetId(other.curPetId);
+      }
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
+      }
+      return this;
+    }
+
+    @Override
+    public RecallPetScRsp clear() {
+      if (isEmpty()) {
+        return this;
+      }
+      cachedSize = -1;
+      bitField0_ = 0;
+      bMCOIJCMNNC = 0;
+      curPetId = 0;
+      retcode = 0;
+      return this;
+    }
+
+    @Override
+    public RecallPetScRsp 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 RecallPetScRsp)) {
+        return false;
+      }
+      RecallPetScRsp other = (RecallPetScRsp) o;
+      return bitField0_ == other.bitField0_
+        && (!hasBMCOIJCMNNC() || bMCOIJCMNNC == other.bMCOIJCMNNC)
+        && (!hasCurPetId() || curPetId == other.curPetId)
+        && (!hasRetcode() || retcode == other.retcode);
+    }
+
+    @Override
+    public void writeTo(final ProtoSink output) throws IOException {
+      if ((bitField0_ & 0x00000001) != 0) {
+        output.writeRawByte((byte) 56);
+        output.writeUInt32NoTag(bMCOIJCMNNC);
+      }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(curPetId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(retcode);
+      }
+    }
+
+    @Override
+    protected int computeSerializedSize() {
+      int size = 0;
+      if ((bitField0_ & 0x00000001) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(bMCOIJCMNNC);
+      }
+      if ((bitField0_ & 0x00000002) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(curPetId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+      }
+      return size;
+    }
+
+    @Override
+    @SuppressWarnings("fallthrough")
+    public RecallPetScRsp mergeFrom(final ProtoSource input) throws IOException {
+      // Enabled Fall-Through Optimization (QuickBuffers)
+      int tag = input.readTag();
+      while (true) {
+        switch (tag) {
+          case 56: {
+            // bMCOIJCMNNC
+            bMCOIJCMNNC = input.readUInt32();
+            bitField0_ |= 0x00000001;
+            tag = input.readTag();
+            if (tag != 104) {
+              break;
+            }
+          }
+          case 104: {
+            // curPetId
+            curPetId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 112) {
+              break;
+            }
+          }
+          case 112: {
+            // retcode
+            retcode = 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.bMCOIJCMNNC, bMCOIJCMNNC);
+      }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeUInt32(FieldNames.curPetId, curPetId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeUInt32(FieldNames.retcode, retcode);
+      }
+      output.endObject();
+    }
+
+    @Override
+    public RecallPetScRsp mergeFrom(final JsonSource input) throws IOException {
+      if (!input.beginObject()) {
+        return this;
+      }
+      while (!input.isAtEnd()) {
+        switch (input.readFieldHash()) {
+          case 1362418561: {
+            if (input.isAtField(FieldNames.bMCOIJCMNNC)) {
+              if (!input.trySkipNullValue()) {
+                bMCOIJCMNNC = input.readUInt32();
+                bitField0_ |= 0x00000001;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 544007226:
+          case -465065190: {
+            if (input.isAtField(FieldNames.curPetId)) {
+              if (!input.trySkipNullValue()) {
+                curPetId = input.readUInt32();
+                bitField0_ |= 0x00000002;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
+              if (!input.trySkipNullValue()) {
+                retcode = input.readUInt32();
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          default: {
+            input.skipUnknownField();
+            break;
+          }
+        }
+      }
+      input.endObject();
+      return this;
+    }
+
+    @Override
+    public RecallPetScRsp clone() {
+      return new RecallPetScRsp().copyFrom(this);
+    }
+
+    @Override
+    public boolean isEmpty() {
+      return ((bitField0_) == 0);
+    }
+
+    public static RecallPetScRsp parseFrom(final byte[] data) throws
+        InvalidProtocolBufferException {
+      return ProtoMessage.mergeFrom(new RecallPetScRsp(), data).checkInitialized();
+    }
+
+    public static RecallPetScRsp parseFrom(final ProtoSource input) throws IOException {
+      return ProtoMessage.mergeFrom(new RecallPetScRsp(), input).checkInitialized();
+    }
+
+    public static RecallPetScRsp parseFrom(final JsonSource input) throws IOException {
+      return ProtoMessage.mergeFrom(new RecallPetScRsp(), input).checkInitialized();
+    }
+
+    /**
+     * @return factory for creating RecallPetScRsp messages
+     */
+    public static MessageFactory getFactory() {
+      return RecallPetScRspFactory.INSTANCE;
+    }
+
+    private enum RecallPetScRspFactory implements MessageFactory {
+      INSTANCE;
+
+      @Override
+      public RecallPetScRsp create() {
+        return RecallPetScRsp.newInstance();
+      }
+    }
+
+    /**
+     * Contains name constants used for serializing JSON
+     */
+    static class FieldNames {
+      static final FieldName bMCOIJCMNNC = FieldName.forField("BMCOIJCMNNC");
+
+      static final FieldName curPetId = FieldName.forField("curPetId", "cur_pet_id");
+
+      static final FieldName retcode = FieldName.forField("retcode");
+    }
+  }
+}
diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java
index 242a54a..0a9c18b 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 = 4;
+     * optional uint32 trigger_entity_id = 11;
      */
     private int triggerEntityId;
 
     /**
-     * optional .MotionInfo trigger_motion = 5;
+     * optional .MotionInfo trigger_motion = 14;
      */
     private final MotionInfoOuterClass.MotionInfo triggerMotion = MotionInfoOuterClass.MotionInfo.newInstance();
 
     /**
-     * optional string trigger_name = 10;
+     * optional string trigger_name = 5;
      */
     private final Utf8String triggerName = Utf8String.newEmptyInstance();
 
     /**
-     * repeated uint32 trigger_target_id_list = 7;
+     * repeated uint32 trigger_target_id_list = 15;
      */
     private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance();
 
@@ -51,7 +51,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 4;
+     * optional uint32 trigger_entity_id = 11;
      * @return whether the triggerEntityId field is set
      */
     public boolean hasTriggerEntityId() {
@@ -59,7 +59,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 4;
+     * optional uint32 trigger_entity_id = 11;
      * @return this
      */
     public RefreshTriggerByClientCsReq clearTriggerEntityId() {
@@ -69,7 +69,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 4;
+     * optional uint32 trigger_entity_id = 11;
      * @return the triggerEntityId
      */
     public int getTriggerEntityId() {
@@ -77,7 +77,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 4;
+     * optional uint32 trigger_entity_id = 11;
      * @param value the triggerEntityId to set
      * @return this
      */
@@ -88,7 +88,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional .MotionInfo trigger_motion = 5;
+     * optional .MotionInfo trigger_motion = 14;
      * @return whether the triggerMotion field is set
      */
     public boolean hasTriggerMotion() {
@@ -96,7 +96,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional .MotionInfo trigger_motion = 5;
+     * optional .MotionInfo trigger_motion = 14;
      * @return this
      */
     public RefreshTriggerByClientCsReq clearTriggerMotion() {
@@ -106,7 +106,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional .MotionInfo trigger_motion = 5;
+     * optional .MotionInfo trigger_motion = 14;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -120,7 +120,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional .MotionInfo trigger_motion = 5;
+     * optional .MotionInfo trigger_motion = 14;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -134,7 +134,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional .MotionInfo trigger_motion = 5;
+     * optional .MotionInfo trigger_motion = 14;
      * @param value the triggerMotion to set
      * @return this
      */
@@ -146,7 +146,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional string trigger_name = 10;
+     * optional string trigger_name = 5;
      * @return whether the triggerName field is set
      */
     public boolean hasTriggerName() {
@@ -154,7 +154,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional string trigger_name = 10;
+     * optional string trigger_name = 5;
      * @return this
      */
     public RefreshTriggerByClientCsReq clearTriggerName() {
@@ -164,7 +164,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional string trigger_name = 10;
+     * optional string trigger_name = 5;
      * @return the triggerName
      */
     public String getTriggerName() {
@@ -172,7 +172,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional string trigger_name = 10;
+     * optional string trigger_name = 5;
      * @return internal {@code Utf8String} representation of triggerName for reading
      */
     public Utf8String getTriggerNameBytes() {
@@ -180,7 +180,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional string trigger_name = 10;
+     * optional string trigger_name = 5;
      * @return internal {@code Utf8String} representation of triggerName for modifications
      */
     public Utf8String getMutableTriggerNameBytes() {
@@ -189,7 +189,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional string trigger_name = 10;
+     * optional string trigger_name = 5;
      * @param value the triggerName to set
      * @return this
      */
@@ -200,7 +200,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * optional string trigger_name = 10;
+     * optional string trigger_name = 5;
      * @param value the triggerName to set
      * @return this
      */
@@ -211,7 +211,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 7;
+     * repeated uint32 trigger_target_id_list = 15;
      * @return whether the triggerTargetIdList field is set
      */
     public boolean hasTriggerTargetIdList() {
@@ -219,7 +219,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 7;
+     * repeated uint32 trigger_target_id_list = 15;
      * @return this
      */
     public RefreshTriggerByClientCsReq clearTriggerTargetIdList() {
@@ -229,7 +229,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 7;
+     * repeated uint32 trigger_target_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.
@@ -243,7 +243,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 7;
+     * repeated uint32 trigger_target_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
@@ -257,7 +257,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 7;
+     * repeated uint32 trigger_target_id_list = 15;
      * @param value the triggerTargetIdList to add
      * @return this
      */
@@ -268,7 +268,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 7;
+     * repeated uint32 trigger_target_id_list = 15;
      * @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) 32);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(triggerEntityId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 114);
         output.writeMessageNoTag(triggerMotion);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 82);
+        output.writeRawByte((byte) 42);
         output.writeStringNoTag(triggerName);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         for (int i = 0; i < triggerTargetIdList.length(); i++) {
-          output.writeRawByte((byte) 56);
+          output.writeRawByte((byte) 120);
           output.writeUInt32NoTag(triggerTargetIdList.array()[i]);
         }
       }
@@ -402,34 +402,34 @@ public final class RefreshTriggerByClientCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
+          case 88: {
             // triggerEntityId
             triggerEntityId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
+            if (tag != 114) {
+              break;
+            }
+          }
+          case 114: {
+            // triggerMotion
+            input.readMessage(triggerMotion);
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
             if (tag != 42) {
               break;
             }
           }
           case 42: {
-            // triggerMotion
-            input.readMessage(triggerMotion);
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 82) {
-              break;
-            }
-          }
-          case 82: {
             // triggerName
             input.readString(triggerName);
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 58) {
+            if (tag != 122) {
               break;
             }
           }
-          case 58: {
+          case 122: {
             // triggerTargetIdList [packed=true]
             input.readPackedUInt32(triggerTargetIdList, tag);
             bitField0_ |= 0x00000008;
@@ -448,7 +448,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
             tag = input.readTag();
             break;
           }
-          case 56: {
+          case 120: {
             // 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 4ca99c5..47b21dc 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 = 13;
+     * optional uint32 trigger_entity_id = 6;
      */
     private int triggerEntityId;
 
     /**
-     * optional string trigger_name = 11;
+     * optional string trigger_name = 8;
      */
     private final Utf8String triggerName = Utf8String.newEmptyInstance();
 
     /**
-     * repeated uint32 trigger_target_id_list = 12;
+     * repeated uint32 trigger_target_id_list = 1;
      */
     private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance();
 
@@ -46,7 +46,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 13;
+     * optional uint32 trigger_entity_id = 6;
      * @return whether the triggerEntityId field is set
      */
     public boolean hasTriggerEntityId() {
@@ -54,7 +54,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 13;
+     * optional uint32 trigger_entity_id = 6;
      * @return this
      */
     public RefreshTriggerByClientScNotify clearTriggerEntityId() {
@@ -64,7 +64,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 13;
+     * optional uint32 trigger_entity_id = 6;
      * @return the triggerEntityId
      */
     public int getTriggerEntityId() {
@@ -72,7 +72,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 13;
+     * optional uint32 trigger_entity_id = 6;
      * @param value the triggerEntityId to set
      * @return this
      */
@@ -83,7 +83,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional string trigger_name = 11;
+     * optional string trigger_name = 8;
      * @return whether the triggerName field is set
      */
     public boolean hasTriggerName() {
@@ -91,7 +91,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional string trigger_name = 11;
+     * optional string trigger_name = 8;
      * @return this
      */
     public RefreshTriggerByClientScNotify clearTriggerName() {
@@ -101,7 +101,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional string trigger_name = 11;
+     * optional string trigger_name = 8;
      * @return the triggerName
      */
     public String getTriggerName() {
@@ -109,7 +109,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional string trigger_name = 11;
+     * optional string trigger_name = 8;
      * @return internal {@code Utf8String} representation of triggerName for reading
      */
     public Utf8String getTriggerNameBytes() {
@@ -117,7 +117,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional string trigger_name = 11;
+     * optional string trigger_name = 8;
      * @return internal {@code Utf8String} representation of triggerName for modifications
      */
     public Utf8String getMutableTriggerNameBytes() {
@@ -126,7 +126,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional string trigger_name = 11;
+     * optional string trigger_name = 8;
      * @param value the triggerName to set
      * @return this
      */
@@ -137,7 +137,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * optional string trigger_name = 11;
+     * optional string trigger_name = 8;
      * @param value the triggerName to set
      * @return this
      */
@@ -148,7 +148,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 12;
+     * repeated uint32 trigger_target_id_list = 1;
      * @return whether the triggerTargetIdList field is set
      */
     public boolean hasTriggerTargetIdList() {
@@ -156,7 +156,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 12;
+     * repeated uint32 trigger_target_id_list = 1;
      * @return this
      */
     public RefreshTriggerByClientScNotify clearTriggerTargetIdList() {
@@ -166,7 +166,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 12;
+     * 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.
@@ -180,7 +180,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 12;
+     * 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
@@ -194,7 +194,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 12;
+     * repeated uint32 trigger_target_id_list = 1;
      * @param value the triggerTargetIdList to add
      * @return this
      */
@@ -205,7 +205,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
     }
 
     /**
-     * repeated uint32 trigger_target_id_list = 12;
+     * repeated uint32 trigger_target_id_list = 1;
      * @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) 104);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(triggerEntityId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 90);
+        output.writeRawByte((byte) 66);
         output.writeStringNoTag(triggerName);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         for (int i = 0; i < triggerTargetIdList.length(); i++) {
-          output.writeRawByte((byte) 96);
+          output.writeRawByte((byte) 8);
           output.writeUInt32NoTag(triggerTargetIdList.array()[i]);
         }
       }
@@ -325,25 +325,25 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 104: {
+          case 48: {
             // triggerEntityId
             triggerEntityId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 66) {
               break;
             }
           }
-          case 90: {
+          case 66: {
             // triggerName
             input.readString(triggerName);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 98) {
+            if (tag != 10) {
               break;
             }
           }
-          case 98: {
+          case 10: {
             // triggerTargetIdList [packed=true]
             input.readPackedUInt32(triggerTargetIdList, tag);
             bitField0_ |= 0x00000004;
@@ -362,7 +362,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
             tag = input.readTag();
             break;
           }
-          case 96: {
+          case 8: {
             // 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 7b31315..308197e 100644
--- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java
@@ -20,22 +20,22 @@ public final class RefreshTriggerByClientScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 trigger_entity_id = 3;
-     */
-    private int triggerEntityId;
-
-    /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 10;
      */
     private int retcode;
 
+    /**
+     * optional uint32 trigger_entity_id = 12;
+     */
+    private int triggerEntityId;
+
     /**
      * optional bool refresh_trigger = 2;
      */
     private boolean refreshTrigger;
 
     /**
-     * optional string trigger_name = 13;
+     * optional string trigger_name = 4;
      */
     private final Utf8String triggerName = Utf8String.newEmptyInstance();
 
@@ -50,62 +50,25 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional uint32 trigger_entity_id = 3;
-     * @return whether the triggerEntityId field is set
+     * optional uint32 retcode = 10;
+     * @return whether the retcode field is set
      */
-    public boolean hasTriggerEntityId() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 trigger_entity_id = 3;
-     * @return this
-     */
-    public RefreshTriggerByClientScRsp clearTriggerEntityId() {
-      bitField0_ &= ~0x00000001;
-      triggerEntityId = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 trigger_entity_id = 3;
-     * @return the triggerEntityId
-     */
-    public int getTriggerEntityId() {
-      return triggerEntityId;
-    }
-
-    /**
-     * optional uint32 trigger_entity_id = 3;
-     * @param value the triggerEntityId to set
-     * @return this
-     */
-    public RefreshTriggerByClientScRsp setTriggerEntityId(final int value) {
-      bitField0_ |= 0x00000001;
-      triggerEntityId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 retcode = 7;
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 10;
      * @return this
      */
     public RefreshTriggerByClientScRsp clearRetcode() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       retcode = 0;
       return this;
     }
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 10;
      * @return the retcode
      */
     public int getRetcode() {
@@ -113,16 +76,53 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 7;
+     * optional uint32 retcode = 10;
      * @param value the retcode to set
      * @return this
      */
     public RefreshTriggerByClientScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       retcode = value;
       return this;
     }
 
+    /**
+     * optional uint32 trigger_entity_id = 12;
+     * @return whether the triggerEntityId field is set
+     */
+    public boolean hasTriggerEntityId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 trigger_entity_id = 12;
+     * @return this
+     */
+    public RefreshTriggerByClientScRsp clearTriggerEntityId() {
+      bitField0_ &= ~0x00000002;
+      triggerEntityId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 trigger_entity_id = 12;
+     * @return the triggerEntityId
+     */
+    public int getTriggerEntityId() {
+      return triggerEntityId;
+    }
+
+    /**
+     * optional uint32 trigger_entity_id = 12;
+     * @param value the triggerEntityId to set
+     * @return this
+     */
+    public RefreshTriggerByClientScRsp setTriggerEntityId(final int value) {
+      bitField0_ |= 0x00000002;
+      triggerEntityId = value;
+      return this;
+    }
+
     /**
      * optional bool refresh_trigger = 2;
      * @return whether the refreshTrigger field is set
@@ -161,7 +161,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional string trigger_name = 13;
+     * optional string trigger_name = 4;
      * @return whether the triggerName field is set
      */
     public boolean hasTriggerName() {
@@ -169,7 +169,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional string trigger_name = 13;
+     * optional string trigger_name = 4;
      * @return this
      */
     public RefreshTriggerByClientScRsp clearTriggerName() {
@@ -179,7 +179,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional string trigger_name = 13;
+     * optional string trigger_name = 4;
      * @return the triggerName
      */
     public String getTriggerName() {
@@ -187,7 +187,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional string trigger_name = 13;
+     * optional string trigger_name = 4;
      * @return internal {@code Utf8String} representation of triggerName for reading
      */
     public Utf8String getTriggerNameBytes() {
@@ -195,7 +195,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional string trigger_name = 13;
+     * optional string trigger_name = 4;
      * @return internal {@code Utf8String} representation of triggerName for modifications
      */
     public Utf8String getMutableTriggerNameBytes() {
@@ -204,7 +204,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional string trigger_name = 13;
+     * optional string trigger_name = 4;
      * @param value the triggerName to set
      * @return this
      */
@@ -215,7 +215,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
     }
 
     /**
-     * optional string trigger_name = 13;
+     * optional string trigger_name = 4;
      * @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_;
-        triggerEntityId = other.triggerEntityId;
         retcode = other.retcode;
+        triggerEntityId = other.triggerEntityId;
         refreshTrigger = other.refreshTrigger;
         triggerName.copyFrom(other.triggerName);
       }
@@ -244,12 +244,12 @@ public final class RefreshTriggerByClientScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasTriggerEntityId()) {
-        setTriggerEntityId(other.triggerEntityId);
-      }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
+      if (other.hasTriggerEntityId()) {
+        setTriggerEntityId(other.triggerEntityId);
+      }
       if (other.hasRefreshTrigger()) {
         setRefreshTrigger(other.refreshTrigger);
       }
@@ -266,8 +266,8 @@ public final class RefreshTriggerByClientScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      triggerEntityId = 0;
       retcode = 0;
+      triggerEntityId = 0;
       refreshTrigger = false;
       triggerName.clear();
       return this;
@@ -294,8 +294,8 @@ public final class RefreshTriggerByClientScRspOuterClass {
       }
       RefreshTriggerByClientScRsp other = (RefreshTriggerByClientScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasTriggerEntityId() || triggerEntityId == other.triggerEntityId)
         && (!hasRetcode() || retcode == other.retcode)
+        && (!hasTriggerEntityId() || triggerEntityId == other.triggerEntityId)
         && (!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) 24);
-        output.writeUInt32NoTag(triggerEntityId);
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 96);
+        output.writeUInt32NoTag(triggerEntityId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 16);
         output.writeBoolNoTag(refreshTrigger);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 106);
+        output.writeRawByte((byte) 34);
         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(triggerEntityId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(triggerEntityId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 2;
@@ -345,18 +345,18 @@ public final class RefreshTriggerByClientScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
-            // triggerEntityId
-            triggerEntityId = input.readUInt32();
+          case 80: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 96) {
               break;
             }
           }
-          case 56: {
-            // retcode
-            retcode = input.readUInt32();
+          case 96: {
+            // triggerEntityId
+            triggerEntityId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 16) {
@@ -368,11 +368,11 @@ public final class RefreshTriggerByClientScRspOuterClass {
             refreshTrigger = input.readBool();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 106) {
+            if (tag != 34) {
               break;
             }
           }
-          case 106: {
+          case 34: {
             // 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.triggerEntityId, triggerEntityId);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.triggerEntityId, triggerEntityId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeBool(FieldNames.refreshTrigger, refreshTrigger);
@@ -420,11 +420,10 @@ public final class RefreshTriggerByClientScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          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_ |= 0x00000001;
               }
             } else {
@@ -432,10 +431,11 @@ public final class RefreshTriggerByClientScRspOuterClass {
             }
             break;
           }
-          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_ |= 0x00000002;
               }
             } else {
@@ -521,10 +521,10 @@ public final class RefreshTriggerByClientScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName triggerEntityId = FieldName.forField("triggerEntityId", "trigger_entity_id");
-
       static final FieldName retcode = FieldName.forField("retcode");
 
+      static final FieldName triggerEntityId = FieldName.forField("triggerEntityId", "trigger_entity_id");
+
       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 07ffd2c..25563fe 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java
@@ -19,15 +19,15 @@ public final class RelicArchiveOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 slot = 5;
-     */
-    private int slot;
-
-    /**
-     * optional uint32 relic_id = 13;
+     * optional uint32 relic_id = 3;
      */
     private int relicId;
 
+    /**
+     * optional uint32 slot = 8;
+     */
+    private int slot;
+
     private RelicArchive() {
     }
 
@@ -39,62 +39,25 @@ public final class RelicArchiveOuterClass {
     }
 
     /**
-     * optional uint32 slot = 5;
-     * @return whether the slot field is set
+     * optional uint32 relic_id = 3;
+     * @return whether the relicId field is set
      */
-    public boolean hasSlot() {
+    public boolean hasRelicId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 slot = 5;
-     * @return this
-     */
-    public RelicArchive clearSlot() {
-      bitField0_ &= ~0x00000001;
-      slot = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 slot = 5;
-     * @return the slot
-     */
-    public int getSlot() {
-      return slot;
-    }
-
-    /**
-     * optional uint32 slot = 5;
-     * @param value the slot to set
-     * @return this
-     */
-    public RelicArchive setSlot(final int value) {
-      bitField0_ |= 0x00000001;
-      slot = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 relic_id = 13;
-     * @return whether the relicId field is set
-     */
-    public boolean hasRelicId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 relic_id = 13;
+     * optional uint32 relic_id = 3;
      * @return this
      */
     public RelicArchive clearRelicId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       relicId = 0;
       return this;
     }
 
     /**
-     * optional uint32 relic_id = 13;
+     * optional uint32 relic_id = 3;
      * @return the relicId
      */
     public int getRelicId() {
@@ -102,23 +65,60 @@ public final class RelicArchiveOuterClass {
     }
 
     /**
-     * optional uint32 relic_id = 13;
+     * optional uint32 relic_id = 3;
      * @param value the relicId to set
      * @return this
      */
     public RelicArchive setRelicId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       relicId = value;
       return this;
     }
 
+    /**
+     * optional uint32 slot = 8;
+     * @return whether the slot field is set
+     */
+    public boolean hasSlot() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 slot = 8;
+     * @return this
+     */
+    public RelicArchive clearSlot() {
+      bitField0_ &= ~0x00000002;
+      slot = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 slot = 8;
+     * @return the slot
+     */
+    public int getSlot() {
+      return slot;
+    }
+
+    /**
+     * optional uint32 slot = 8;
+     * @param value the slot to set
+     * @return this
+     */
+    public RelicArchive setSlot(final int value) {
+      bitField0_ |= 0x00000002;
+      slot = value;
+      return this;
+    }
+
     @Override
     public RelicArchive copyFrom(final RelicArchive other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        slot = other.slot;
         relicId = other.relicId;
+        slot = other.slot;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class RelicArchiveOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasSlot()) {
-        setSlot(other.slot);
-      }
       if (other.hasRelicId()) {
         setRelicId(other.relicId);
       }
+      if (other.hasSlot()) {
+        setSlot(other.slot);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class RelicArchiveOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      slot = 0;
       relicId = 0;
+      slot = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class RelicArchiveOuterClass {
       }
       RelicArchive other = (RelicArchive) o;
       return bitField0_ == other.bitField0_
-        && (!hasSlot() || slot == other.slot)
-        && (!hasRelicId() || relicId == other.relicId);
+        && (!hasRelicId() || relicId == other.relicId)
+        && (!hasSlot() || slot == other.slot);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeUInt32NoTag(slot);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(relicId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 104);
-        output.writeUInt32NoTag(relicId);
+        output.writeRawByte((byte) 64);
+        output.writeUInt32NoTag(slot);
       }
     }
 
@@ -190,10 +190,10 @@ public final class RelicArchiveOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(relicId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(relicId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class RelicArchiveOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
-            // slot
-            slot = input.readUInt32();
+          case 24: {
+            // relicId
+            relicId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 64) {
               break;
             }
           }
-          case 104: {
-            // relicId
-            relicId = input.readUInt32();
+          case 64: {
+            // slot
+            slot = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class RelicArchiveOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.slot, slot);
+        output.writeUInt32(FieldNames.relicId, relicId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.relicId, relicId);
+        output.writeUInt32(FieldNames.slot, slot);
       }
       output.endObject();
     }
@@ -256,10 +256,11 @@ public final class RelicArchiveOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 3533310: {
-            if (input.isAtField(FieldNames.slot)) {
+          case 1090714606:
+          case -547564185: {
+            if (input.isAtField(FieldNames.relicId)) {
               if (!input.trySkipNullValue()) {
-                slot = input.readUInt32();
+                relicId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -267,11 +268,10 @@ public final class RelicArchiveOuterClass {
             }
             break;
           }
-          case 1090714606:
-          case -547564185: {
-            if (input.isAtField(FieldNames.relicId)) {
+          case 3533310: {
+            if (input.isAtField(FieldNames.slot)) {
               if (!input.trySkipNullValue()) {
-                relicId = input.readUInt32();
+                slot = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -331,9 +331,9 @@ public final class RelicArchiveOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName slot = FieldName.forField("slot");
-
       static final FieldName relicId = FieldName.forField("relicId", "relic_id");
+
+      static final FieldName slot = FieldName.forField("slot");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendCsReqOuterClass.java
index a79decc..a2c95ff 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class RelicAvatarRecommendCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 set_id = 13;
+     * optional uint32 set_id = 8;
      */
     private int setId;
 
@@ -34,7 +34,7 @@ public final class RelicAvatarRecommendCsReqOuterClass {
     }
 
     /**
-     * optional uint32 set_id = 13;
+     * optional uint32 set_id = 8;
      * @return whether the setId field is set
      */
     public boolean hasSetId() {
@@ -42,7 +42,7 @@ public final class RelicAvatarRecommendCsReqOuterClass {
     }
 
     /**
-     * optional uint32 set_id = 13;
+     * optional uint32 set_id = 8;
      * @return this
      */
     public RelicAvatarRecommendCsReq clearSetId() {
@@ -52,7 +52,7 @@ public final class RelicAvatarRecommendCsReqOuterClass {
     }
 
     /**
-     * optional uint32 set_id = 13;
+     * optional uint32 set_id = 8;
      * @return the setId
      */
     public int getSetId() {
@@ -60,7 +60,7 @@ public final class RelicAvatarRecommendCsReqOuterClass {
     }
 
     /**
-     * optional uint32 set_id = 13;
+     * optional uint32 set_id = 8;
      * @param value the setId to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class RelicAvatarRecommendCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(setId);
       }
     }
@@ -150,7 +150,7 @@ public final class RelicAvatarRecommendCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 104: {
+          case 64: {
             // setId
             setId = input.readUInt32();
             bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendScRspOuterClass.java
index ce214a6..367dc3a 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendScRspOuterClass.java
@@ -20,22 +20,22 @@ public final class RelicAvatarRecommendScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 set_id = 8;
+     * optional uint32 set_id = 5;
      */
     private int setId;
 
     /**
-     * optional uint32 retcode = 12;
+     * optional uint32 retcode = 8;
      */
     private int retcode;
 
     /**
-     * optional bool is_fetch_avatar_list = 1;
+     * optional bool is_fetch_avatar_list = 7;
      */
     private boolean isFetchAvatarList;
 
     /**
-     * repeated uint32 avatar_id_list = 10;
+     * repeated uint32 avatar_id_list = 14;
      */
     private final RepeatedInt avatarIdList = RepeatedInt.newEmptyInstance();
 
@@ -50,7 +50,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 set_id = 8;
+     * optional uint32 set_id = 5;
      * @return whether the setId field is set
      */
     public boolean hasSetId() {
@@ -58,7 +58,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 set_id = 8;
+     * optional uint32 set_id = 5;
      * @return this
      */
     public RelicAvatarRecommendScRsp clearSetId() {
@@ -68,7 +68,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 set_id = 8;
+     * optional uint32 set_id = 5;
      * @return the setId
      */
     public int getSetId() {
@@ -76,7 +76,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 set_id = 8;
+     * optional uint32 set_id = 5;
      * @param value the setId to set
      * @return this
      */
@@ -87,7 +87,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 12;
+     * optional uint32 retcode = 8;
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -95,7 +95,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 12;
+     * optional uint32 retcode = 8;
      * @return this
      */
     public RelicAvatarRecommendScRsp clearRetcode() {
@@ -105,7 +105,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 12;
+     * optional uint32 retcode = 8;
      * @return the retcode
      */
     public int getRetcode() {
@@ -113,7 +113,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 12;
+     * optional uint32 retcode = 8;
      * @param value the retcode to set
      * @return this
      */
@@ -124,7 +124,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional bool is_fetch_avatar_list = 1;
+     * optional bool is_fetch_avatar_list = 7;
      * @return whether the isFetchAvatarList field is set
      */
     public boolean hasIsFetchAvatarList() {
@@ -132,7 +132,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional bool is_fetch_avatar_list = 1;
+     * optional bool is_fetch_avatar_list = 7;
      * @return this
      */
     public RelicAvatarRecommendScRsp clearIsFetchAvatarList() {
@@ -142,7 +142,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional bool is_fetch_avatar_list = 1;
+     * optional bool is_fetch_avatar_list = 7;
      * @return the isFetchAvatarList
      */
     public boolean getIsFetchAvatarList() {
@@ -150,7 +150,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * optional bool is_fetch_avatar_list = 1;
+     * optional bool is_fetch_avatar_list = 7;
      * @param value the isFetchAvatarList to set
      * @return this
      */
@@ -161,7 +161,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * repeated uint32 avatar_id_list = 10;
+     * repeated uint32 avatar_id_list = 14;
      * @return whether the avatarIdList field is set
      */
     public boolean hasAvatarIdList() {
@@ -169,7 +169,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * repeated uint32 avatar_id_list = 10;
+     * repeated uint32 avatar_id_list = 14;
      * @return this
      */
     public RelicAvatarRecommendScRsp clearAvatarIdList() {
@@ -179,7 +179,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * repeated uint32 avatar_id_list = 10;
+     * 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.
@@ -193,7 +193,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * repeated uint32 avatar_id_list = 10;
+     * 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
@@ -207,7 +207,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * repeated uint32 avatar_id_list = 10;
+     * repeated uint32 avatar_id_list = 14;
      * @param value the avatarIdList to add
      * @return this
      */
@@ -218,7 +218,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
     }
 
     /**
-     * repeated uint32 avatar_id_list = 10;
+     * repeated uint32 avatar_id_list = 14;
      * @param values the avatarIdList to add
      * @return this
      */
@@ -306,20 +306,20 @@ public final class RelicAvatarRecommendScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(setId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 56);
         output.writeBoolNoTag(isFetchAvatarList);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         for (int i = 0; i < avatarIdList.length(); i++) {
-          output.writeRawByte((byte) 80);
+          output.writeRawByte((byte) 112);
           output.writeUInt32NoTag(avatarIdList.array()[i]);
         }
       }
@@ -350,34 +350,34 @@ public final class RelicAvatarRecommendScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 64: {
+          case 40: {
             // setId
             setId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 64) {
               break;
             }
           }
-          case 96: {
+          case 64: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 8) {
+            if (tag != 56) {
               break;
             }
           }
-          case 8: {
+          case 56: {
             // isFetchAvatarList
             isFetchAvatarList = input.readBool();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 82) {
+            if (tag != 114) {
               break;
             }
           }
-          case 82: {
+          case 114: {
             // avatarIdList [packed=true]
             input.readPackedUInt32(avatarIdList, tag);
             bitField0_ |= 0x00000008;
@@ -396,7 +396,7 @@ public final class RelicAvatarRecommendScRspOuterClass {
             tag = input.readTag();
             break;
           }
-          case 80: {
+          case 112: {
             // avatarIdList [packed=false]
             tag = input.readRepeatedUInt32(avatarIdList, tag);
             bitField0_ |= 0x00000008;
diff --git a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java
index ac05ce5..801501c 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java
@@ -20,37 +20,37 @@ public final class RelicOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 main_affix_id = 5;
-     */
-    private int mainAffixId;
-
-    /**
-     * optional uint32 exp = 7;
-     */
-    private int exp;
-
-    /**
-     * optional uint32 unique_id = 9;
+     * optional uint32 unique_id = 1;
      */
     private int uniqueId;
 
     /**
-     * optional uint32 equip_avatar_id = 10;
-     */
-    private int equipAvatarId;
-
-    /**
-     * optional uint32 tid = 13;
-     */
-    private int tid;
-
-    /**
-     * optional uint32 level = 15;
+     * optional uint32 level = 2;
      */
     private int level;
 
     /**
-     * optional bool is_protected = 8;
+     * optional uint32 exp = 6;
+     */
+    private int exp;
+
+    /**
+     * optional uint32 equip_avatar_id = 8;
+     */
+    private int equipAvatarId;
+
+    /**
+     * optional uint32 tid = 12;
+     */
+    private int tid;
+
+    /**
+     * optional uint32 main_affix_id = 15;
+     */
+    private int mainAffixId;
+
+    /**
+     * optional bool is_protected = 4;
      */
     private boolean isProtected;
 
@@ -60,7 +60,7 @@ public final class RelicOuterClass {
     private boolean isDiscarded;
 
     /**
-     * repeated .RelicAffix sub_affix_list = 12;
+     * repeated .RelicAffix sub_affix_list = 10;
      */
     private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory());
 
@@ -75,99 +75,25 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 main_affix_id = 5;
-     * @return whether the mainAffixId field is set
+     * optional uint32 unique_id = 1;
+     * @return whether the uniqueId field is set
      */
-    public boolean hasMainAffixId() {
+    public boolean hasUniqueId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 main_affix_id = 5;
-     * @return this
-     */
-    public Relic clearMainAffixId() {
-      bitField0_ &= ~0x00000001;
-      mainAffixId = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 main_affix_id = 5;
-     * @return the mainAffixId
-     */
-    public int getMainAffixId() {
-      return mainAffixId;
-    }
-
-    /**
-     * optional uint32 main_affix_id = 5;
-     * @param value the mainAffixId to set
-     * @return this
-     */
-    public Relic setMainAffixId(final int value) {
-      bitField0_ |= 0x00000001;
-      mainAffixId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 exp = 7;
-     * @return whether the exp field is set
-     */
-    public boolean hasExp() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 exp = 7;
-     * @return this
-     */
-    public Relic clearExp() {
-      bitField0_ &= ~0x00000002;
-      exp = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 exp = 7;
-     * @return the exp
-     */
-    public int getExp() {
-      return exp;
-    }
-
-    /**
-     * optional uint32 exp = 7;
-     * @param value the exp to set
-     * @return this
-     */
-    public Relic setExp(final int value) {
-      bitField0_ |= 0x00000002;
-      exp = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 unique_id = 9;
-     * @return whether the uniqueId field is set
-     */
-    public boolean hasUniqueId() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * optional uint32 unique_id = 9;
+     * optional uint32 unique_id = 1;
      * @return this
      */
     public Relic clearUniqueId() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000001;
       uniqueId = 0;
       return this;
     }
 
     /**
-     * optional uint32 unique_id = 9;
+     * optional uint32 unique_id = 1;
      * @return the uniqueId
      */
     public int getUniqueId() {
@@ -175,18 +101,92 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 unique_id = 9;
+     * optional uint32 unique_id = 1;
      * @param value the uniqueId to set
      * @return this
      */
     public Relic setUniqueId(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000001;
       uniqueId = value;
       return this;
     }
 
     /**
-     * optional uint32 equip_avatar_id = 10;
+     * optional uint32 level = 2;
+     * @return whether the level field is set
+     */
+    public boolean hasLevel() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 level = 2;
+     * @return this
+     */
+    public Relic clearLevel() {
+      bitField0_ &= ~0x00000002;
+      level = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 level = 2;
+     * @return the level
+     */
+    public int getLevel() {
+      return level;
+    }
+
+    /**
+     * optional uint32 level = 2;
+     * @param value the level to set
+     * @return this
+     */
+    public Relic setLevel(final int value) {
+      bitField0_ |= 0x00000002;
+      level = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 exp = 6;
+     * @return whether the exp field is set
+     */
+    public boolean hasExp() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * optional uint32 exp = 6;
+     * @return this
+     */
+    public Relic clearExp() {
+      bitField0_ &= ~0x00000004;
+      exp = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 exp = 6;
+     * @return the exp
+     */
+    public int getExp() {
+      return exp;
+    }
+
+    /**
+     * optional uint32 exp = 6;
+     * @param value the exp to set
+     * @return this
+     */
+    public Relic setExp(final int value) {
+      bitField0_ |= 0x00000004;
+      exp = value;
+      return this;
+    }
+
+    /**
+     * optional uint32 equip_avatar_id = 8;
      * @return whether the equipAvatarId field is set
      */
     public boolean hasEquipAvatarId() {
@@ -194,7 +194,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 equip_avatar_id = 10;
+     * optional uint32 equip_avatar_id = 8;
      * @return this
      */
     public Relic clearEquipAvatarId() {
@@ -204,7 +204,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 equip_avatar_id = 10;
+     * optional uint32 equip_avatar_id = 8;
      * @return the equipAvatarId
      */
     public int getEquipAvatarId() {
@@ -212,7 +212,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 equip_avatar_id = 10;
+     * optional uint32 equip_avatar_id = 8;
      * @param value the equipAvatarId to set
      * @return this
      */
@@ -223,7 +223,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 tid = 13;
+     * optional uint32 tid = 12;
      * @return whether the tid field is set
      */
     public boolean hasTid() {
@@ -231,7 +231,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 tid = 13;
+     * optional uint32 tid = 12;
      * @return this
      */
     public Relic clearTid() {
@@ -241,7 +241,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 tid = 13;
+     * optional uint32 tid = 12;
      * @return the tid
      */
     public int getTid() {
@@ -249,7 +249,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 tid = 13;
+     * optional uint32 tid = 12;
      * @param value the tid to set
      * @return this
      */
@@ -260,44 +260,44 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional uint32 level = 15;
-     * @return whether the level field is set
+     * optional uint32 main_affix_id = 15;
+     * @return whether the mainAffixId field is set
      */
-    public boolean hasLevel() {
+    public boolean hasMainAffixId() {
       return (bitField0_ & 0x00000020) != 0;
     }
 
     /**
-     * optional uint32 level = 15;
+     * optional uint32 main_affix_id = 15;
      * @return this
      */
-    public Relic clearLevel() {
+    public Relic clearMainAffixId() {
       bitField0_ &= ~0x00000020;
-      level = 0;
+      mainAffixId = 0;
       return this;
     }
 
     /**
-     * optional uint32 level = 15;
-     * @return the level
+     * optional uint32 main_affix_id = 15;
+     * @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 = 15;
+     * @param value the mainAffixId to set
      * @return this
      */
-    public Relic setLevel(final int value) {
+    public Relic setMainAffixId(final int value) {
       bitField0_ |= 0x00000020;
-      level = value;
+      mainAffixId = value;
       return this;
     }
 
     /**
-     * optional bool is_protected = 8;
+     * optional bool is_protected = 4;
      * @return whether the isProtected field is set
      */
     public boolean hasIsProtected() {
@@ -305,7 +305,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional bool is_protected = 8;
+     * optional bool is_protected = 4;
      * @return this
      */
     public Relic clearIsProtected() {
@@ -315,7 +315,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional bool is_protected = 8;
+     * optional bool is_protected = 4;
      * @return the isProtected
      */
     public boolean getIsProtected() {
@@ -323,7 +323,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * optional bool is_protected = 8;
+     * optional bool is_protected = 4;
      * @param value the isProtected to set
      * @return this
      */
@@ -371,7 +371,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * repeated .RelicAffix sub_affix_list = 12;
+     * repeated .RelicAffix sub_affix_list = 10;
      * @return whether the subAffixList field is set
      */
     public boolean hasSubAffixList() {
@@ -379,7 +379,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * repeated .RelicAffix sub_affix_list = 12;
+     * repeated .RelicAffix sub_affix_list = 10;
      * @return this
      */
     public Relic clearSubAffixList() {
@@ -389,7 +389,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * repeated .RelicAffix sub_affix_list = 12;
+     * repeated .RelicAffix sub_affix_list = 10;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -403,7 +403,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * repeated .RelicAffix sub_affix_list = 12;
+     * repeated .RelicAffix sub_affix_list = 10;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -417,7 +417,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * repeated .RelicAffix sub_affix_list = 12;
+     * repeated .RelicAffix sub_affix_list = 10;
      * @param value the subAffixList to add
      * @return this
      */
@@ -428,7 +428,7 @@ public final class RelicOuterClass {
     }
 
     /**
-     * repeated .RelicAffix sub_affix_list = 12;
+     * repeated .RelicAffix sub_affix_list = 10;
      * @param values the subAffixList to add
      * @return this
      */
@@ -443,12 +443,12 @@ public final class RelicOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        mainAffixId = other.mainAffixId;
-        exp = other.exp;
         uniqueId = other.uniqueId;
+        level = other.level;
+        exp = other.exp;
         equipAvatarId = other.equipAvatarId;
         tid = other.tid;
-        level = other.level;
+        mainAffixId = other.mainAffixId;
         isProtected = other.isProtected;
         isDiscarded = other.isDiscarded;
         subAffixList.copyFrom(other.subAffixList);
@@ -462,23 +462,23 @@ public final class RelicOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasMainAffixId()) {
-        setMainAffixId(other.mainAffixId);
+      if (other.hasUniqueId()) {
+        setUniqueId(other.uniqueId);
+      }
+      if (other.hasLevel()) {
+        setLevel(other.level);
       }
       if (other.hasExp()) {
         setExp(other.exp);
       }
-      if (other.hasUniqueId()) {
-        setUniqueId(other.uniqueId);
-      }
       if (other.hasEquipAvatarId()) {
         setEquipAvatarId(other.equipAvatarId);
       }
       if (other.hasTid()) {
         setTid(other.tid);
       }
-      if (other.hasLevel()) {
-        setLevel(other.level);
+      if (other.hasMainAffixId()) {
+        setMainAffixId(other.mainAffixId);
       }
       if (other.hasIsProtected()) {
         setIsProtected(other.isProtected);
@@ -499,12 +499,12 @@ public final class RelicOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      mainAffixId = 0;
-      exp = 0;
       uniqueId = 0;
+      level = 0;
+      exp = 0;
       equipAvatarId = 0;
       tid = 0;
-      level = 0;
+      mainAffixId = 0;
       isProtected = false;
       isDiscarded = false;
       subAffixList.clear();
@@ -532,12 +532,12 @@ public final class RelicOuterClass {
       }
       Relic other = (Relic) o;
       return bitField0_ == other.bitField0_
-        && (!hasMainAffixId() || mainAffixId == other.mainAffixId)
-        && (!hasExp() || exp == other.exp)
         && (!hasUniqueId() || uniqueId == other.uniqueId)
+        && (!hasLevel() || level == other.level)
+        && (!hasExp() || exp == other.exp)
         && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId)
         && (!hasTid() || tid == other.tid)
-        && (!hasLevel() || level == other.level)
+        && (!hasMainAffixId() || mainAffixId == other.mainAffixId)
         && (!hasIsProtected() || isProtected == other.isProtected)
         && (!hasIsDiscarded() || isDiscarded == other.isDiscarded)
         && (!hasSubAffixList() || subAffixList.equals(other.subAffixList));
@@ -546,31 +546,31 @@ public final class RelicOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeUInt32NoTag(mainAffixId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(exp);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 72);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(uniqueId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 16);
+        output.writeUInt32NoTag(level);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 48);
+        output.writeUInt32NoTag(exp);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(equipAvatarId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(tid);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         output.writeRawByte((byte) 120);
-        output.writeUInt32NoTag(level);
+        output.writeUInt32NoTag(mainAffixId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 32);
         output.writeBoolNoTag(isProtected);
       }
       if ((bitField0_ & 0x00000080) != 0) {
@@ -579,7 +579,7 @@ public final class RelicOuterClass {
       }
       if ((bitField0_ & 0x00000100) != 0) {
         for (int i = 0; i < subAffixList.length(); i++) {
-          output.writeRawByte((byte) 98);
+          output.writeRawByte((byte) 82);
           output.writeMessageNoTag(subAffixList.get(i));
         }
       }
@@ -589,13 +589,13 @@ public final class RelicOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId);
@@ -604,7 +604,7 @@ public final class RelicOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(tid);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         size += 2;
@@ -625,43 +625,43 @@ public final class RelicOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
-            // mainAffixId
-            mainAffixId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 56) {
-              break;
-            }
-          }
-          case 56: {
-            // exp
-            exp = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 72) {
-              break;
-            }
-          }
-          case 72: {
+          case 8: {
             // uniqueId
             uniqueId = input.readUInt32();
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 80) {
+            if (tag != 16) {
               break;
             }
           }
-          case 80: {
+          case 16: {
+            // level
+            level = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 48) {
+              break;
+            }
+          }
+          case 48: {
+            // exp
+            exp = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 64) {
+              break;
+            }
+          }
+          case 64: {
             // equipAvatarId
             equipAvatarId = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 96) {
               break;
             }
           }
-          case 104: {
+          case 96: {
             // tid
             tid = input.readUInt32();
             bitField0_ |= 0x00000010;
@@ -671,15 +671,15 @@ public final class RelicOuterClass {
             }
           }
           case 120: {
-            // level
-            level = input.readUInt32();
+            // mainAffixId
+            mainAffixId = input.readUInt32();
             bitField0_ |= 0x00000020;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 32) {
               break;
             }
           }
-          case 64: {
+          case 32: {
             // isProtected
             isProtected = input.readBool();
             bitField0_ |= 0x00000040;
@@ -693,11 +693,11 @@ public final class RelicOuterClass {
             isDiscarded = input.readBool();
             bitField0_ |= 0x00000080;
             tag = input.readTag();
-            if (tag != 98) {
+            if (tag != 82) {
               break;
             }
           }
-          case 98: {
+          case 82: {
             // subAffixList
             tag = input.readRepeatedMessage(subAffixList, tag);
             bitField0_ |= 0x00000100;
@@ -723,13 +723,13 @@ public final class RelicOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.mainAffixId, mainAffixId);
+        output.writeUInt32(FieldNames.uniqueId, uniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.exp, exp);
+        output.writeUInt32(FieldNames.level, level);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.uniqueId, uniqueId);
+        output.writeUInt32(FieldNames.exp, exp);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId);
@@ -738,7 +738,7 @@ public final class RelicOuterClass {
         output.writeUInt32(FieldNames.tid, tid);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeUInt32(FieldNames.level, level);
+        output.writeUInt32(FieldNames.mainAffixId, mainAffixId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         output.writeBool(FieldNames.isProtected, isProtected);
@@ -759,11 +759,11 @@ public final class RelicOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -1973876974:
-          case -1426712144: {
-            if (input.isAtField(FieldNames.mainAffixId)) {
+          case -294460212:
+          case -538310583: {
+            if (input.isAtField(FieldNames.uniqueId)) {
               if (!input.trySkipNullValue()) {
-                mainAffixId = input.readUInt32();
+                uniqueId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -771,22 +771,21 @@ 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_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case -294460212:
-          case -538310583: {
-            if (input.isAtField(FieldNames.uniqueId)) {
-              if (!input.trySkipNullValue()) {
-                uniqueId = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -817,10 +816,11 @@ public final class RelicOuterClass {
             }
             break;
           }
-          case 102865796: {
-            if (input.isAtField(FieldNames.level)) {
+          case -1973876974:
+          case -1426712144: {
+            if (input.isAtField(FieldNames.mainAffixId)) {
               if (!input.trySkipNullValue()) {
-                level = input.readUInt32();
+                mainAffixId = input.readUInt32();
                 bitField0_ |= 0x00000020;
               }
             } else {
@@ -916,17 +916,17 @@ public final class RelicOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
+      static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
+
+      static final FieldName level = FieldName.forField("level");
 
       static final FieldName exp = FieldName.forField("exp");
 
-      static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
-
       static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id");
 
       static final FieldName tid = FieldName.forField("tid");
 
-      static final FieldName level = FieldName.forField("level");
+      static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
 
       static final FieldName isProtected = FieldName.forField("isProtected", "is_protected");
 
diff --git a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java
index e20d4cb..6bcb29a 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java
@@ -19,15 +19,15 @@ public final class RelicParamOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 slot = 10;
-     */
-    private int slot;
-
-    /**
-     * optional uint32 relic_unique_id = 11;
+     * optional uint32 relic_unique_id = 5;
      */
     private int relicUniqueId;
 
+    /**
+     * optional uint32 slot = 6;
+     */
+    private int slot;
+
     private RelicParam() {
     }
 
@@ -39,62 +39,25 @@ public final class RelicParamOuterClass {
     }
 
     /**
-     * optional uint32 slot = 10;
-     * @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 = 10;
-     * @return this
-     */
-    public RelicParam clearSlot() {
-      bitField0_ &= ~0x00000001;
-      slot = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 slot = 10;
-     * @return the slot
-     */
-    public int getSlot() {
-      return slot;
-    }
-
-    /**
-     * optional uint32 slot = 10;
-     * @param value the slot to set
-     * @return this
-     */
-    public RelicParam 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 RelicParam 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 RelicParamOuterClass {
     }
 
     /**
-     * optional uint32 relic_unique_id = 11;
+     * optional uint32 relic_unique_id = 5;
      * @param value the relicUniqueId to set
      * @return this
      */
     public RelicParam setRelicUniqueId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       relicUniqueId = value;
       return this;
     }
 
+    /**
+     * optional uint32 slot = 6;
+     * @return whether the slot field is set
+     */
+    public boolean hasSlot() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * optional uint32 slot = 6;
+     * @return this
+     */
+    public RelicParam clearSlot() {
+      bitField0_ &= ~0x00000002;
+      slot = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 slot = 6;
+     * @return the slot
+     */
+    public int getSlot() {
+      return slot;
+    }
+
+    /**
+     * optional uint32 slot = 6;
+     * @param value the slot to set
+     * @return this
+     */
+    public RelicParam setSlot(final int value) {
+      bitField0_ |= 0x00000002;
+      slot = value;
+      return this;
+    }
+
     @Override
     public RelicParam copyFrom(final RelicParam 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 RelicParamOuterClass {
         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 RelicParamOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      slot = 0;
       relicUniqueId = 0;
+      slot = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class RelicParamOuterClass {
       }
       RelicParam other = (RelicParam) 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) 80);
-        output.writeUInt32NoTag(slot);
+        output.writeRawByte((byte) 40);
+        output.writeUInt32NoTag(relicUniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(relicUniqueId);
+        output.writeRawByte((byte) 48);
+        output.writeUInt32NoTag(slot);
       }
     }
 
@@ -190,10 +190,10 @@ public final class RelicParamOuterClass {
     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 RelicParamOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 80: {
-            // slot
-            slot = input.readUInt32();
+          case 40: {
+            // relicUniqueId
+            relicUniqueId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 48) {
               break;
             }
           }
-          case 88: {
-            // relicUniqueId
-            relicUniqueId = input.readUInt32();
+          case 48: {
+            // slot
+            slot = 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.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 RelicParamOuterClass {
       }
       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 RelicParamOuterClass {
             }
             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 RelicParamOuterClass {
      * 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/RelicRecommendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicRecommendCsReqOuterClass.java
index 9608440..271b630 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicRecommendCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicRecommendCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class RelicRecommendCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 avatar_id = 2;
+     * optional uint32 avatar_id = 9;
      */
     private int avatarId;
 
@@ -34,7 +34,7 @@ public final class RelicRecommendCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 2;
+     * optional uint32 avatar_id = 9;
      * @return whether the avatarId field is set
      */
     public boolean hasAvatarId() {
@@ -42,7 +42,7 @@ public final class RelicRecommendCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 2;
+     * optional uint32 avatar_id = 9;
      * @return this
      */
     public RelicRecommendCsReq clearAvatarId() {
@@ -52,7 +52,7 @@ public final class RelicRecommendCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 2;
+     * optional uint32 avatar_id = 9;
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -60,7 +60,7 @@ public final class RelicRecommendCsReqOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 2;
+     * optional uint32 avatar_id = 9;
      * @param value the avatarId to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class RelicRecommendCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(avatarId);
       }
     }
@@ -150,7 +150,7 @@ public final class RelicRecommendCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
+          case 72: {
             // avatarId
             avatarId = input.readUInt32();
             bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RelicRecommendScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicRecommendScRspOuterClass.java
index 316c11f..c077e6e 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicRecommendScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicRecommendScRspOuterClass.java
@@ -19,15 +19,15 @@ public final class RelicRecommendScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 retcode = 6;
-     */
-    private int retcode;
-
-    /**
-     * optional uint32 avatar_id = 11;
+     * optional uint32 avatar_id = 2;
      */
     private int avatarId;
 
+    /**
+     * optional uint32 retcode = 10;
+     */
+    private int retcode;
+
     private RelicRecommendScRsp() {
     }
 
@@ -39,62 +39,25 @@ public final class RelicRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 6;
-     * @return whether the retcode field is set
+     * optional uint32 avatar_id = 2;
+     * @return whether the avatarId field is set
      */
-    public boolean hasRetcode() {
+    public boolean hasAvatarId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 retcode = 6;
-     * @return this
-     */
-    public RelicRecommendScRsp clearRetcode() {
-      bitField0_ &= ~0x00000001;
-      retcode = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 retcode = 6;
-     * @return the retcode
-     */
-    public int getRetcode() {
-      return retcode;
-    }
-
-    /**
-     * optional uint32 retcode = 6;
-     * @param value the retcode to set
-     * @return this
-     */
-    public RelicRecommendScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000001;
-      retcode = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 avatar_id = 11;
-     * @return whether the avatarId field is set
-     */
-    public boolean hasAvatarId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 avatar_id = 11;
+     * optional uint32 avatar_id = 2;
      * @return this
      */
     public RelicRecommendScRsp clearAvatarId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       avatarId = 0;
       return this;
     }
 
     /**
-     * optional uint32 avatar_id = 11;
+     * optional uint32 avatar_id = 2;
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -102,23 +65,60 @@ public final class RelicRecommendScRspOuterClass {
     }
 
     /**
-     * optional uint32 avatar_id = 11;
+     * optional uint32 avatar_id = 2;
      * @param value the avatarId to set
      * @return this
      */
     public RelicRecommendScRsp setAvatarId(final int value) {
-      bitField0_ |= 0x00000002;
+      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;
+     * @return this
+     */
+    public RelicRecommendScRsp 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 RelicRecommendScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000002;
+      retcode = value;
+      return this;
+    }
+
     @Override
     public RelicRecommendScRsp copyFrom(final RelicRecommendScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        retcode = other.retcode;
         avatarId = other.avatarId;
+        retcode = other.retcode;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class RelicRecommendScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
-      }
       if (other.hasAvatarId()) {
         setAvatarId(other.avatarId);
       }
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class RelicRecommendScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      retcode = 0;
       avatarId = 0;
+      retcode = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class RelicRecommendScRspOuterClass {
       }
       RelicRecommendScRsp other = (RelicRecommendScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasRetcode() || retcode == other.retcode)
-        && (!hasAvatarId() || avatarId == other.avatarId);
+        && (!hasAvatarId() || avatarId == other.avatarId)
+        && (!hasRetcode() || retcode == other.retcode);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 48);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 16);
+        output.writeUInt32NoTag(avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(avatarId);
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(retcode);
       }
     }
 
@@ -190,10 +190,10 @@ public final class RelicRecommendScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class RelicRecommendScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
-            // retcode
-            retcode = input.readUInt32();
+          case 16: {
+            // avatarId
+            avatarId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 80) {
               break;
             }
           }
-          case 88: {
-            // avatarId
-            avatarId = input.readUInt32();
+          case 80: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class RelicRecommendScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.avatarId, avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.avatarId, avatarId);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       output.endObject();
     }
@@ -256,10 +256,11 @@ public final class RelicRecommendScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case 1787287636:
+          case -428636735: {
+            if (input.isAtField(FieldNames.avatarId)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                avatarId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -267,11 +268,10 @@ public final class RelicRecommendScRspOuterClass {
             }
             break;
           }
-          case 1787287636:
-          case -428636735: {
-            if (input.isAtField(FieldNames.avatarId)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                avatarId = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -332,9 +332,9 @@ public final class RelicRecommendScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName retcode = FieldName.forField("retcode");
-
       static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
+
+      static final FieldName retcode = FieldName.forField("retcode");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/RemoveRotaterCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RemoveRotaterCsReqOuterClass.java
index b33c8f8..d0745fe 100644
--- a/src/generated/main/emu/lunarcore/proto/RemoveRotaterCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RemoveRotaterCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class RemoveRotaterCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional .RotaterData rotater_data = 6;
+     * optional .RotaterData rotater_data = 12;
      */
     private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance();
 
@@ -34,7 +34,7 @@ public final class RemoveRotaterCsReqOuterClass {
     }
 
     /**
-     * optional .RotaterData rotater_data = 6;
+     * optional .RotaterData rotater_data = 12;
      * @return whether the rotaterData field is set
      */
     public boolean hasRotaterData() {
@@ -42,7 +42,7 @@ public final class RemoveRotaterCsReqOuterClass {
     }
 
     /**
-     * optional .RotaterData rotater_data = 6;
+     * optional .RotaterData rotater_data = 12;
      * @return this
      */
     public RemoveRotaterCsReq clearRotaterData() {
@@ -52,7 +52,7 @@ public final class RemoveRotaterCsReqOuterClass {
     }
 
     /**
-     * optional .RotaterData rotater_data = 6;
+     * optional .RotaterData rotater_data = 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 RemoveRotaterCsReqOuterClass {
     }
 
     /**
-     * optional .RotaterData rotater_data = 6;
+     * optional .RotaterData rotater_data = 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 RemoveRotaterCsReqOuterClass {
     }
 
     /**
-     * optional .RotaterData rotater_data = 6;
+     * optional .RotaterData rotater_data = 12;
      * @param value the rotaterData to set
      * @return this
      */
@@ -150,7 +150,7 @@ public final class RemoveRotaterCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 50);
+        output.writeRawByte((byte) 98);
         output.writeMessageNoTag(rotaterData);
       }
     }
@@ -171,7 +171,7 @@ public final class RemoveRotaterCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 50: {
+          case 98: {
             // rotaterData
             input.readMessage(rotaterData);
             bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RemoveRotaterScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RemoveRotaterScRspOuterClass.java
index 15da912..7365325 100644
--- a/src/generated/main/emu/lunarcore/proto/RemoveRotaterScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RemoveRotaterScRspOuterClass.java
@@ -19,20 +19,20 @@ public final class RemoveRotaterScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 retcode = 2;
+     * optional uint32 retcode = 15;
      */
     private int retcode;
 
     /**
-     * optional .RotaterData rotater_data = 13;
-     */
-    private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance();
-
-    /**
-     * optional .RotatorEnergyInfo energy_info = 15;
+     * optional .RotatorEnergyInfo energy_info = 6;
      */
     private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance();
 
+    /**
+     * optional .RotaterData rotater_data = 7;
+     */
+    private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance();
+
     private RemoveRotaterScRsp() {
     }
 
@@ -44,7 +44,7 @@ public final class RemoveRotaterScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 2;
+     * optional uint32 retcode = 15;
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class RemoveRotaterScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 2;
+     * optional uint32 retcode = 15;
      * @return this
      */
     public RemoveRotaterScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class RemoveRotaterScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 2;
+     * optional uint32 retcode = 15;
      * @return the retcode
      */
     public int getRetcode() {
@@ -70,7 +70,7 @@ public final class RemoveRotaterScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 2;
+     * optional uint32 retcode = 15;
      * @param value the retcode to set
      * @return this
      */
@@ -81,82 +81,25 @@ public final class RemoveRotaterScRspOuterClass {
     }
 
     /**
-     * optional .RotaterData rotater_data = 13;
-     * @return whether the rotaterData field is set
+     * optional .RotatorEnergyInfo energy_info = 6;
+     * @return whether the energyInfo field is set
      */
-    public boolean hasRotaterData() {
+    public boolean hasEnergyInfo() {
       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;
+     * optional .RotatorEnergyInfo energy_info = 6;
      * @return this
      */
     public RemoveRotaterScRsp clearEnergyInfo() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       energyInfo.clear();
       return this;
     }
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 15;
+     * 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.
@@ -170,7 +113,7 @@ public final class RemoveRotaterScRspOuterClass {
     }
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 15;
+     * 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
@@ -179,30 +122,87 @@ public final class RemoveRotaterScRspOuterClass {
      * @return internal storage object for modifications
      */
     public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getMutableEnergyInfo() {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       return energyInfo;
     }
 
     /**
-     * optional .RotatorEnergyInfo energy_info = 15;
+     * optional .RotatorEnergyInfo energy_info = 6;
      * @param value the energyInfo to set
      * @return this
      */
     public RemoveRotaterScRsp setEnergyInfo(
         final RotatorEnergyInfoOuterClass.RotatorEnergyInfo value) {
-      bitField0_ |= 0x00000004;
+      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;
+     * @return this
+     */
+    public RemoveRotaterScRsp clearRotaterData() {
+      bitField0_ &= ~0x00000004;
+      rotaterData.clear();
+      return this;
+    }
+
+    /**
+     * optional .RotaterData rotater_data = 7;
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * 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 = 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 RotaterDataOuterClass.RotaterData getMutableRotaterData() {
+      bitField0_ |= 0x00000004;
+      return rotaterData;
+    }
+
+    /**
+     * optional .RotaterData rotater_data = 7;
+     * @param value the rotaterData to set
+     * @return this
+     */
+    public RemoveRotaterScRsp setRotaterData(final RotaterDataOuterClass.RotaterData value) {
+      bitField0_ |= 0x00000004;
+      rotaterData.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);
+        rotaterData.copyFrom(other.rotaterData);
       }
       return this;
     }
@@ -216,12 +216,12 @@ public final class RemoveRotaterScRspOuterClass {
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
-      if (other.hasRotaterData()) {
-        getMutableRotaterData().mergeFrom(other.rotaterData);
-      }
       if (other.hasEnergyInfo()) {
         getMutableEnergyInfo().mergeFrom(other.energyInfo);
       }
+      if (other.hasRotaterData()) {
+        getMutableRotaterData().mergeFrom(other.rotaterData);
+      }
       return this;
     }
 
@@ -233,8 +233,8 @@ public final class RemoveRotaterScRspOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       retcode = 0;
-      rotaterData.clear();
       energyInfo.clear();
+      rotaterData.clear();
       return this;
     }
 
@@ -245,8 +245,8 @@ public final class RemoveRotaterScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      rotaterData.clearQuick();
       energyInfo.clearQuick();
+      rotaterData.clearQuick();
       return this;
     }
 
@@ -261,23 +261,23 @@ public final class RemoveRotaterScRspOuterClass {
       RemoveRotaterScRsp other = (RemoveRotaterScRsp) o;
       return bitField0_ == other.bitField0_
         && (!hasRetcode() || retcode == other.retcode)
-        && (!hasRotaterData() || rotaterData.equals(other.rotaterData))
-        && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo));
+        && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo))
+        && (!hasRotaterData() || rotaterData.equals(other.rotaterData));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 120);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 106);
-        output.writeMessageNoTag(rotaterData);
+        output.writeRawByte((byte) 50);
+        output.writeMessageNoTag(energyInfo);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 122);
-        output.writeMessageNoTag(energyInfo);
+        output.writeRawByte((byte) 58);
+        output.writeMessageNoTag(rotaterData);
       }
     }
 
@@ -288,10 +288,10 @@ public final class RemoveRotaterScRspOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData);
       }
       return size;
     }
@@ -303,27 +303,27 @@ public final class RemoveRotaterScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
+          case 120: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 106) {
+            if (tag != 50) {
               break;
             }
           }
-          case 106: {
-            // rotaterData
-            input.readMessage(rotaterData);
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 122) {
-              break;
-            }
-          }
-          case 122: {
+          case 50: {
             // energyInfo
             input.readMessage(energyInfo);
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 58) {
+              break;
+            }
+          }
+          case 58: {
+            // rotaterData
+            input.readMessage(rotaterData);
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 0) {
@@ -351,10 +351,10 @@ public final class RemoveRotaterScRspOuterClass {
         output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeMessage(FieldNames.rotaterData, rotaterData);
+        output.writeMessage(FieldNames.energyInfo, energyInfo);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeMessage(FieldNames.energyInfo, energyInfo);
+        output.writeMessage(FieldNames.rotaterData, rotaterData);
       }
       output.endObject();
     }
@@ -377,11 +377,11 @@ public final class RemoveRotaterScRspOuterClass {
             }
             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_ |= 0x00000002;
               }
             } else {
@@ -389,11 +389,11 @@ public final class RemoveRotaterScRspOuterClass {
             }
             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_ |= 0x00000004;
               }
             } else {
@@ -456,9 +456,9 @@ public final class RemoveRotaterScRspOuterClass {
     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");
+
+      static final FieldName rotaterData = FieldName.forField("rotaterData", "rotater_data");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java
index bd6828a..e19d8a7 100644
--- a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java
@@ -25,27 +25,27 @@ public final class ReplaceLineupCsReqOuterClass {
     private int index;
 
     /**
-     * optional uint32 plane_id = 3;
-     */
-    private int planeId;
-
-    /**
-     * optional uint32 leader_slot = 7;
+     * optional uint32 leader_slot = 3;
      */
     private int leaderSlot;
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional uint32 plane_id = 7;
+     */
+    private int planeId;
+
+    /**
+     * optional .ExtraLineupType extra_lineup_type = 12;
      */
     private int extraLineupType;
 
     /**
-     * optional bool is_virtual = 4;
+     * optional bool is_virtual = 10;
      */
     private boolean isVirtual;
 
     /**
-     * repeated .LineupSlotData slots = 14;
+     * repeated .LineupSlotData slots = 9;
      */
     private final RepeatedMessage slots = RepeatedMessage.newEmptyInstance(LineupSlotDataOuterClass.LineupSlotData.getFactory());
 
@@ -97,62 +97,25 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional uint32 plane_id = 3;
-     * @return whether the planeId field is set
+     * optional uint32 leader_slot = 3;
+     * @return whether the leaderSlot field is set
      */
-    public boolean hasPlaneId() {
+    public boolean hasLeaderSlot() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * optional uint32 plane_id = 3;
-     * @return this
-     */
-    public ReplaceLineupCsReq clearPlaneId() {
-      bitField0_ &= ~0x00000002;
-      planeId = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 plane_id = 3;
-     * @return the planeId
-     */
-    public int getPlaneId() {
-      return planeId;
-    }
-
-    /**
-     * optional uint32 plane_id = 3;
-     * @param value the planeId to set
-     * @return this
-     */
-    public ReplaceLineupCsReq setPlaneId(final int value) {
-      bitField0_ |= 0x00000002;
-      planeId = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 leader_slot = 7;
-     * @return whether the leaderSlot field is set
-     */
-    public boolean hasLeaderSlot() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * optional uint32 leader_slot = 7;
+     * optional uint32 leader_slot = 3;
      * @return this
      */
     public ReplaceLineupCsReq clearLeaderSlot() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       leaderSlot = 0;
       return this;
     }
 
     /**
-     * optional uint32 leader_slot = 7;
+     * optional uint32 leader_slot = 3;
      * @return the leaderSlot
      */
     public int getLeaderSlot() {
@@ -160,18 +123,55 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional uint32 leader_slot = 7;
+     * optional uint32 leader_slot = 3;
      * @param value the leaderSlot to set
      * @return this
      */
     public ReplaceLineupCsReq setLeaderSlot(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       leaderSlot = value;
       return this;
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional uint32 plane_id = 7;
+     * @return whether the planeId field is set
+     */
+    public boolean hasPlaneId() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * optional uint32 plane_id = 7;
+     * @return this
+     */
+    public ReplaceLineupCsReq clearPlaneId() {
+      bitField0_ &= ~0x00000004;
+      planeId = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 plane_id = 7;
+     * @return the planeId
+     */
+    public int getPlaneId() {
+      return planeId;
+    }
+
+    /**
+     * optional uint32 plane_id = 7;
+     * @param value the planeId to set
+     * @return this
+     */
+    public ReplaceLineupCsReq setPlaneId(final int value) {
+      bitField0_ |= 0x00000004;
+      planeId = value;
+      return this;
+    }
+
+    /**
+     * optional .ExtraLineupType extra_lineup_type = 12;
      * @return whether the extraLineupType field is set
      */
     public boolean hasExtraLineupType() {
@@ -179,7 +179,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional .ExtraLineupType extra_lineup_type = 12;
      * @return this
      */
     public ReplaceLineupCsReq clearExtraLineupType() {
@@ -189,7 +189,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional .ExtraLineupType extra_lineup_type = 12;
      * @return the extraLineupType
      */
     public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -222,7 +222,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional .ExtraLineupType extra_lineup_type = 10;
+     * optional .ExtraLineupType extra_lineup_type = 12;
      * @param value the extraLineupType to set
      * @return this
      */
@@ -234,7 +234,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 4;
+     * optional bool is_virtual = 10;
      * @return whether the isVirtual field is set
      */
     public boolean hasIsVirtual() {
@@ -242,7 +242,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 4;
+     * optional bool is_virtual = 10;
      * @return this
      */
     public ReplaceLineupCsReq clearIsVirtual() {
@@ -252,7 +252,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 4;
+     * optional bool is_virtual = 10;
      * @return the isVirtual
      */
     public boolean getIsVirtual() {
@@ -260,7 +260,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * optional bool is_virtual = 4;
+     * optional bool is_virtual = 10;
      * @param value the isVirtual to set
      * @return this
      */
@@ -271,7 +271,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * repeated .LineupSlotData slots = 14;
+     * repeated .LineupSlotData slots = 9;
      * @return whether the slots field is set
      */
     public boolean hasSlots() {
@@ -279,7 +279,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * repeated .LineupSlotData slots = 14;
+     * repeated .LineupSlotData slots = 9;
      * @return this
      */
     public ReplaceLineupCsReq clearSlots() {
@@ -289,7 +289,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * repeated .LineupSlotData slots = 14;
+     * repeated .LineupSlotData slots = 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.
@@ -303,7 +303,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * repeated .LineupSlotData slots = 14;
+     * repeated .LineupSlotData slots = 9;
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -317,7 +317,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * repeated .LineupSlotData slots = 14;
+     * repeated .LineupSlotData slots = 9;
      * @param value the slots to add
      * @return this
      */
@@ -328,7 +328,7 @@ public final class ReplaceLineupCsReqOuterClass {
     }
 
     /**
-     * repeated .LineupSlotData slots = 14;
+     * repeated .LineupSlotData slots = 9;
      * @param values the slots to add
      * @return this
      */
@@ -344,8 +344,8 @@ public final class ReplaceLineupCsReqOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         index = other.index;
-        planeId = other.planeId;
         leaderSlot = other.leaderSlot;
+        planeId = other.planeId;
         extraLineupType = other.extraLineupType;
         isVirtual = other.isVirtual;
         slots.copyFrom(other.slots);
@@ -362,12 +362,12 @@ public final class ReplaceLineupCsReqOuterClass {
       if (other.hasIndex()) {
         setIndex(other.index);
       }
-      if (other.hasPlaneId()) {
-        setPlaneId(other.planeId);
-      }
       if (other.hasLeaderSlot()) {
         setLeaderSlot(other.leaderSlot);
       }
+      if (other.hasPlaneId()) {
+        setPlaneId(other.planeId);
+      }
       if (other.hasExtraLineupType()) {
         setExtraLineupTypeValue(other.extraLineupType);
       }
@@ -388,8 +388,8 @@ public final class ReplaceLineupCsReqOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       index = 0;
-      planeId = 0;
       leaderSlot = 0;
+      planeId = 0;
       extraLineupType = 0;
       isVirtual = false;
       slots.clear();
@@ -418,8 +418,8 @@ public final class ReplaceLineupCsReqOuterClass {
       ReplaceLineupCsReq other = (ReplaceLineupCsReq) o;
       return bitField0_ == other.bitField0_
         && (!hasIndex() || index == other.index)
-        && (!hasPlaneId() || planeId == other.planeId)
         && (!hasLeaderSlot() || leaderSlot == other.leaderSlot)
+        && (!hasPlaneId() || planeId == other.planeId)
         && (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
         && (!hasIsVirtual() || isVirtual == other.isVirtual)
         && (!hasSlots() || slots.equals(other.slots));
@@ -433,23 +433,23 @@ public final class ReplaceLineupCsReqOuterClass {
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeRawByte((byte) 24);
-        output.writeUInt32NoTag(planeId);
+        output.writeUInt32NoTag(leaderSlot);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(leaderSlot);
+        output.writeUInt32NoTag(planeId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 96);
         output.writeEnumNoTag(extraLineupType);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 80);
         output.writeBoolNoTag(isVirtual);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         for (int i = 0; i < slots.length(); i++) {
-          output.writeRawByte((byte) 114);
+          output.writeRawByte((byte) 74);
           output.writeMessageNoTag(slots.get(i));
         }
       }
@@ -462,10 +462,10 @@ public final class ReplaceLineupCsReqOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
@@ -496,8 +496,8 @@ public final class ReplaceLineupCsReqOuterClass {
             }
           }
           case 24: {
-            // planeId
-            planeId = input.readUInt32();
+            // leaderSlot
+            leaderSlot = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 56) {
@@ -505,15 +505,15 @@ public final class ReplaceLineupCsReqOuterClass {
             }
           }
           case 56: {
-            // leaderSlot
-            leaderSlot = input.readUInt32();
+            // planeId
+            planeId = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 80) {
+            if (tag != 96) {
               break;
             }
           }
-          case 80: {
+          case 96: {
             // extraLineupType
             final int value = input.readInt32();
             if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
@@ -521,20 +521,20 @@ public final class ReplaceLineupCsReqOuterClass {
               bitField0_ |= 0x00000008;
             }
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 80) {
               break;
             }
           }
-          case 32: {
+          case 80: {
             // isVirtual
             isVirtual = input.readBool();
             bitField0_ |= 0x00000010;
             tag = input.readTag();
-            if (tag != 114) {
+            if (tag != 74) {
               break;
             }
           }
-          case 114: {
+          case 74: {
             // slots
             tag = input.readRepeatedMessage(slots, tag);
             bitField0_ |= 0x00000020;
@@ -563,10 +563,10 @@ public final class ReplaceLineupCsReqOuterClass {
         output.writeUInt32(FieldNames.index, index);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.planeId, planeId);
+        output.writeUInt32(FieldNames.leaderSlot, leaderSlot);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.leaderSlot, leaderSlot);
+        output.writeUInt32(FieldNames.planeId, planeId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
@@ -598,11 +598,11 @@ public final class ReplaceLineupCsReqOuterClass {
             }
             break;
           }
-          case -493896553:
-          case 1869097438: {
-            if (input.isAtField(FieldNames.planeId)) {
+          case 1191442087:
+          case -1708713100: {
+            if (input.isAtField(FieldNames.leaderSlot)) {
               if (!input.trySkipNullValue()) {
-                planeId = input.readUInt32();
+                leaderSlot = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -610,11 +610,11 @@ public final class ReplaceLineupCsReqOuterClass {
             }
             break;
           }
-          case 1191442087:
-          case -1708713100: {
-            if (input.isAtField(FieldNames.leaderSlot)) {
+          case -493896553:
+          case 1869097438: {
+            if (input.isAtField(FieldNames.planeId)) {
               if (!input.trySkipNullValue()) {
-                leaderSlot = input.readUInt32();
+                planeId = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -717,10 +717,10 @@ public final class ReplaceLineupCsReqOuterClass {
     static class FieldNames {
       static final FieldName index = FieldName.forField("index");
 
-      static final FieldName planeId = FieldName.forField("planeId", "plane_id");
-
       static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot");
 
+      static final FieldName planeId = FieldName.forField("planeId", "plane_id");
+
       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 5b35ff6..74ddf9a 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 = 6;
+     * optional uint32 num = 1;
      */
     private int num;
 
@@ -34,7 +34,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
     }
 
     /**
-     * optional uint32 num = 6;
+     * optional uint32 num = 1;
      * @return whether the num field is set
      */
     public boolean hasNum() {
@@ -42,7 +42,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
     }
 
     /**
-     * optional uint32 num = 6;
+     * optional uint32 num = 1;
      * @return this
      */
     public ReserveStaminaExchangeCsReq clearNum() {
@@ -52,7 +52,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
     }
 
     /**
-     * optional uint32 num = 6;
+     * optional uint32 num = 1;
      * @return the num
      */
     public int getNum() {
@@ -60,7 +60,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
     }
 
     /**
-     * optional uint32 num = 6;
+     * optional uint32 num = 1;
      * @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) 48);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(num);
       }
     }
@@ -150,7 +150,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
+          case 8: {
             // 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 f22159c..09003e3 100644
--- a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java
@@ -19,15 +19,15 @@ public final class ReserveStaminaExchangeScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * optional uint32 retcode = 2;
-     */
-    private int retcode;
-
-    /**
-     * optional uint32 num = 13;
+     * optional uint32 num = 2;
      */
     private int num;
 
+    /**
+     * optional uint32 retcode = 14;
+     */
+    private int retcode;
+
     private ReserveStaminaExchangeScRsp() {
     }
 
@@ -39,62 +39,25 @@ public final class ReserveStaminaExchangeScRspOuterClass {
     }
 
     /**
-     * optional uint32 retcode = 2;
-     * @return whether the retcode field is set
+     * optional uint32 num = 2;
+     * @return whether the num field is set
      */
-    public boolean hasRetcode() {
+    public boolean hasNum() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * optional uint32 retcode = 2;
-     * @return this
-     */
-    public ReserveStaminaExchangeScRsp 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 ReserveStaminaExchangeScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000001;
-      retcode = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 num = 13;
-     * @return whether the num field is set
-     */
-    public boolean hasNum() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * optional uint32 num = 13;
+     * optional uint32 num = 2;
      * @return this
      */
     public ReserveStaminaExchangeScRsp clearNum() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       num = 0;
       return this;
     }
 
     /**
-     * optional uint32 num = 13;
+     * optional uint32 num = 2;
      * @return the num
      */
     public int getNum() {
@@ -102,23 +65,60 @@ public final class ReserveStaminaExchangeScRspOuterClass {
     }
 
     /**
-     * optional uint32 num = 13;
+     * optional uint32 num = 2;
      * @param value the num to set
      * @return this
      */
     public ReserveStaminaExchangeScRsp setNum(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       num = 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;
+     * @return this
+     */
+    public ReserveStaminaExchangeScRsp clearRetcode() {
+      bitField0_ &= ~0x00000002;
+      retcode = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 retcode = 14;
+     * @return the retcode
+     */
+    public int getRetcode() {
+      return retcode;
+    }
+
+    /**
+     * optional uint32 retcode = 14;
+     * @param value the retcode to set
+     * @return this
+     */
+    public ReserveStaminaExchangeScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000002;
+      retcode = value;
+      return this;
+    }
+
     @Override
     public ReserveStaminaExchangeScRsp copyFrom(final ReserveStaminaExchangeScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        retcode = other.retcode;
         num = other.num;
+        retcode = other.retcode;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class ReserveStaminaExchangeScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
-      }
       if (other.hasNum()) {
         setNum(other.num);
       }
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class ReserveStaminaExchangeScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      retcode = 0;
       num = 0;
+      retcode = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class ReserveStaminaExchangeScRspOuterClass {
       }
       ReserveStaminaExchangeScRsp other = (ReserveStaminaExchangeScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasRetcode() || retcode == other.retcode)
-        && (!hasNum() || num == other.num);
+        && (!hasNum() || num == other.num)
+        && (!hasRetcode() || retcode == other.retcode);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         output.writeRawByte((byte) 16);
-        output.writeUInt32NoTag(retcode);
+        output.writeUInt32NoTag(num);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 104);
-        output.writeUInt32NoTag(num);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(retcode);
       }
     }
 
@@ -190,10 +190,10 @@ public final class ReserveStaminaExchangeScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       return size;
     }
@@ -206,17 +206,17 @@ public final class ReserveStaminaExchangeScRspOuterClass {
       while (true) {
         switch (tag) {
           case 16: {
-            // retcode
-            retcode = input.readUInt32();
+            // num
+            num = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 112) {
               break;
             }
           }
-          case 104: {
-            // num
-            num = input.readUInt32();
+          case 112: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class ReserveStaminaExchangeScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.num, num);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.num, num);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       output.endObject();
     }
@@ -256,10 +256,10 @@ public final class ReserveStaminaExchangeScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case 109446: {
+            if (input.isAtField(FieldNames.num)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                num = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -267,10 +267,10 @@ public final class ReserveStaminaExchangeScRspOuterClass {
             }
             break;
           }
-          case 109446: {
-            if (input.isAtField(FieldNames.num)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                num = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -332,9 +332,9 @@ public final class ReserveStaminaExchangeScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName retcode = FieldName.forField("retcode");
-
       static final FieldName num = FieldName.forField("num");
+
+      static final FieldName retcode = FieldName.forField("retcode");
     }
   }
 }
diff --git a/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java
index a44c9e3..c20bbf0 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 from_uid = 4;
+     * optional uint32 from_uid = 9;
      */
     private int fromUid;
 
     /**
-     * optional uint32 to_uid = 7;
-     */
-    private int toUid;
-
-    /**
-     * optional uint32 emote = 8;
+     * optional uint32 emote = 11;
      */
     private int emote;
 
     /**
-     * optional .ChatType chat_type = 6;
+     * optional uint32 to_uid = 12;
      */
-    private int chatType;
+    private int toUid;
 
     /**
-     * optional .MsgType msg_type = 11;
+     * optional .MsgType msg_type = 1;
      */
     private int msgType;
 
     /**
-     * optional string text = 10;
+     * optional .ChatType chat_type = 10;
+     */
+    private int chatType;
+
+    /**
+     * optional string text = 7;
      */
     private final Utf8String text = Utf8String.newEmptyInstance();
 
@@ -60,7 +60,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 from_uid = 4;
+     * optional uint32 from_uid = 9;
      * @return whether the fromUid field is set
      */
     public boolean hasFromUid() {
@@ -68,7 +68,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 from_uid = 4;
+     * optional uint32 from_uid = 9;
      * @return this
      */
     public RevcMsgScNotify clearFromUid() {
@@ -78,7 +78,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 from_uid = 4;
+     * optional uint32 from_uid = 9;
      * @return the fromUid
      */
     public int getFromUid() {
@@ -86,7 +86,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 from_uid = 4;
+     * optional uint32 from_uid = 9;
      * @param value the fromUid to set
      * @return this
      */
@@ -97,62 +97,25 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 to_uid = 7;
-     * @return whether the toUid field is set
+     * optional uint32 emote = 11;
+     * @return whether the emote field is set
      */
-    public boolean hasToUid() {
+    public boolean hasEmote() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * optional uint32 to_uid = 7;
-     * @return this
-     */
-    public RevcMsgScNotify clearToUid() {
-      bitField0_ &= ~0x00000002;
-      toUid = 0;
-      return this;
-    }
-
-    /**
-     * optional uint32 to_uid = 7;
-     * @return the toUid
-     */
-    public int getToUid() {
-      return toUid;
-    }
-
-    /**
-     * optional uint32 to_uid = 7;
-     * @param value the toUid to set
-     * @return this
-     */
-    public RevcMsgScNotify setToUid(final int value) {
-      bitField0_ |= 0x00000002;
-      toUid = value;
-      return this;
-    }
-
-    /**
-     * optional uint32 emote = 8;
-     * @return whether the emote field is set
-     */
-    public boolean hasEmote() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * optional uint32 emote = 8;
+     * optional uint32 emote = 11;
      * @return this
      */
     public RevcMsgScNotify clearEmote() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       emote = 0;
       return this;
     }
 
     /**
-     * optional uint32 emote = 8;
+     * optional uint32 emote = 11;
      * @return the emote
      */
     public int getEmote() {
@@ -160,98 +123,73 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional uint32 emote = 8;
+     * optional uint32 emote = 11;
      * @param value the emote to set
      * @return this
      */
     public RevcMsgScNotify setEmote(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       emote = value;
       return this;
     }
 
     /**
-     * optional .ChatType chat_type = 6;
-     * @return whether the chatType field is set
+     * optional uint32 to_uid = 12;
+     * @return whether the toUid field is set
      */
-    public boolean hasChatType() {
+    public boolean hasToUid() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * optional uint32 to_uid = 12;
+     * @return this
+     */
+    public RevcMsgScNotify clearToUid() {
+      bitField0_ &= ~0x00000004;
+      toUid = 0;
+      return this;
+    }
+
+    /**
+     * optional uint32 to_uid = 12;
+     * @return the toUid
+     */
+    public int getToUid() {
+      return toUid;
+    }
+
+    /**
+     * optional uint32 to_uid = 12;
+     * @param value the toUid to set
+     * @return this
+     */
+    public RevcMsgScNotify setToUid(final int value) {
+      bitField0_ |= 0x00000004;
+      toUid = value;
+      return this;
+    }
+
+    /**
+     * optional .MsgType msg_type = 1;
+     * @return whether the msgType field is set
+     */
+    public boolean hasMsgType() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * optional .ChatType chat_type = 6;
-     * @return this
-     */
-    public RevcMsgScNotify clearChatType() {
-      bitField0_ &= ~0x00000008;
-      chatType = 0;
-      return this;
-    }
-
-    /**
-     * optional .ChatType chat_type = 6;
-     * @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 RevcMsgScNotify#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 RevcMsgScNotify#getChatType()} to return null
-     *
-     * @param value the numeric wire value to set
-     * @return this
-     */
-    public RevcMsgScNotify setChatTypeValue(final int value) {
-      bitField0_ |= 0x00000008;
-      chatType = value;
-      return this;
-    }
-
-    /**
-     * optional .ChatType chat_type = 6;
-     * @param value the chatType to set
-     * @return this
-     */
-    public RevcMsgScNotify setChatType(final ChatTypeOuterClass.ChatType value) {
-      bitField0_ |= 0x00000008;
-      chatType = value.getNumber();
-      return this;
-    }
-
-    /**
-     * optional .MsgType msg_type = 11;
-     * @return whether the msgType field is set
-     */
-    public boolean hasMsgType() {
-      return (bitField0_ & 0x00000010) != 0;
-    }
-
-    /**
-     * optional .MsgType msg_type = 11;
+     * optional .MsgType msg_type = 1;
      * @return this
      */
     public RevcMsgScNotify clearMsgType() {
-      bitField0_ &= ~0x00000010;
+      bitField0_ &= ~0x00000008;
       msgType = 0;
       return this;
     }
 
     /**
-     * optional .MsgType msg_type = 11;
+     * optional .MsgType msg_type = 1;
      * @return the msgType
      */
     public MsgTypeOuterClass.MsgType getMsgType() {
@@ -278,24 +216,86 @@ public final class RevcMsgScNotifyOuterClass {
      * @return this
      */
     public RevcMsgScNotify setMsgTypeValue(final int value) {
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000008;
       msgType = value;
       return this;
     }
 
     /**
-     * optional .MsgType msg_type = 11;
+     * optional .MsgType msg_type = 1;
      * @param value the msgType to set
      * @return this
      */
     public RevcMsgScNotify setMsgType(final MsgTypeOuterClass.MsgType value) {
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000008;
       msgType = value.getNumber();
       return this;
     }
 
     /**
-     * optional string text = 10;
+     * optional .ChatType chat_type = 10;
+     * @return whether the chatType field is set
+     */
+    public boolean hasChatType() {
+      return (bitField0_ & 0x00000010) != 0;
+    }
+
+    /**
+     * optional .ChatType chat_type = 10;
+     * @return this
+     */
+    public RevcMsgScNotify clearChatType() {
+      bitField0_ &= ~0x00000010;
+      chatType = 0;
+      return this;
+    }
+
+    /**
+     * optional .ChatType chat_type = 10;
+     * @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 RevcMsgScNotify#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 RevcMsgScNotify#getChatType()} to return null
+     *
+     * @param value the numeric wire value to set
+     * @return this
+     */
+    public RevcMsgScNotify setChatTypeValue(final int value) {
+      bitField0_ |= 0x00000010;
+      chatType = value;
+      return this;
+    }
+
+    /**
+     * optional .ChatType chat_type = 10;
+     * @param value the chatType to set
+     * @return this
+     */
+    public RevcMsgScNotify setChatType(final ChatTypeOuterClass.ChatType value) {
+      bitField0_ |= 0x00000010;
+      chatType = value.getNumber();
+      return this;
+    }
+
+    /**
+     * optional string text = 7;
      * @return whether the text field is set
      */
     public boolean hasText() {
@@ -303,7 +303,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional string text = 10;
+     * optional string text = 7;
      * @return this
      */
     public RevcMsgScNotify clearText() {
@@ -313,7 +313,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional string text = 10;
+     * optional string text = 7;
      * @return the text
      */
     public String getText() {
@@ -321,7 +321,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional string text = 10;
+     * optional string text = 7;
      * @return internal {@code Utf8String} representation of text for reading
      */
     public Utf8String getTextBytes() {
@@ -329,7 +329,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional string text = 10;
+     * optional string text = 7;
      * @return internal {@code Utf8String} representation of text for modifications
      */
     public Utf8String getMutableTextBytes() {
@@ -338,7 +338,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional string text = 10;
+     * optional string text = 7;
      * @param value the text to set
      * @return this
      */
@@ -349,7 +349,7 @@ public final class RevcMsgScNotifyOuterClass {
     }
 
     /**
-     * optional string text = 10;
+     * optional string text = 7;
      * @param value the text to set
      * @return this
      */
@@ -365,10 +365,10 @@ public final class RevcMsgScNotifyOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         fromUid = other.fromUid;
-        toUid = other.toUid;
         emote = other.emote;
-        chatType = other.chatType;
+        toUid = other.toUid;
         msgType = other.msgType;
+        chatType = other.chatType;
         text.copyFrom(other.text);
       }
       return this;
@@ -383,18 +383,18 @@ public final class RevcMsgScNotifyOuterClass {
       if (other.hasFromUid()) {
         setFromUid(other.fromUid);
       }
-      if (other.hasToUid()) {
-        setToUid(other.toUid);
-      }
       if (other.hasEmote()) {
         setEmote(other.emote);
       }
-      if (other.hasChatType()) {
-        setChatTypeValue(other.chatType);
+      if (other.hasToUid()) {
+        setToUid(other.toUid);
       }
       if (other.hasMsgType()) {
         setMsgTypeValue(other.msgType);
       }
+      if (other.hasChatType()) {
+        setChatTypeValue(other.chatType);
+      }
       if (other.hasText()) {
         getMutableTextBytes().copyFrom(other.text);
       }
@@ -409,10 +409,10 @@ public final class RevcMsgScNotifyOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       fromUid = 0;
-      toUid = 0;
       emote = 0;
-      chatType = 0;
+      toUid = 0;
       msgType = 0;
+      chatType = 0;
       text.clear();
       return this;
     }
@@ -439,37 +439,37 @@ public final class RevcMsgScNotifyOuterClass {
       RevcMsgScNotify other = (RevcMsgScNotify) o;
       return bitField0_ == other.bitField0_
         && (!hasFromUid() || fromUid == other.fromUid)
-        && (!hasToUid() || toUid == other.toUid)
         && (!hasEmote() || emote == other.emote)
-        && (!hasChatType() || chatType == other.chatType)
+        && (!hasToUid() || toUid == other.toUid)
         && (!hasMsgType() || msgType == other.msgType)
+        && (!hasChatType() || chatType == other.chatType)
         && (!hasText() || text.equals(other.text));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(fromUid);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(toUid);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(emote);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 48);
-        output.writeEnumNoTag(chatType);
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 96);
+        output.writeUInt32NoTag(toUid);
       }
-      if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 88);
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeRawByte((byte) 8);
         output.writeEnumNoTag(msgType);
       }
+      if ((bitField0_ & 0x00000010) != 0) {
+        output.writeRawByte((byte) 80);
+        output.writeEnumNoTag(chatType);
+      }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 82);
+        output.writeRawByte((byte) 58);
         output.writeStringNoTag(text);
       }
     }
@@ -481,16 +481,16 @@ public final class RevcMsgScNotifyOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(emote);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeEnumSizeNoTag(chatType);
+        size += 1 + ProtoSink.computeEnumSizeNoTag(msgType);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        size += 1 + ProtoSink.computeEnumSizeNoTag(msgType);
+        size += 1 + ProtoSink.computeEnumSizeNoTag(chatType);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         size += 1 + ProtoSink.computeStringSizeNoTag(text);
@@ -505,58 +505,58 @@ public final class RevcMsgScNotifyOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
+          case 72: {
             // fromUid
             fromUid = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 56) {
-              break;
-            }
-          }
-          case 56: {
-            // toUid
-            toUid = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 64) {
-              break;
-            }
-          }
-          case 64: {
-            // emote
-            emote = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 48) {
-              break;
-            }
-          }
-          case 48: {
-            // chatType
-            final int value = input.readInt32();
-            if (ChatTypeOuterClass.ChatType.forNumber(value) != null) {
-              chatType = value;
-              bitField0_ |= 0x00000008;
-            }
-            tag = input.readTag();
             if (tag != 88) {
               break;
             }
           }
           case 88: {
+            // emote
+            emote = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 96) {
+              break;
+            }
+          }
+          case 96: {
+            // toUid
+            toUid = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 8) {
+              break;
+            }
+          }
+          case 8: {
             // msgType
             final int value = input.readInt32();
             if (MsgTypeOuterClass.MsgType.forNumber(value) != null) {
               msgType = value;
-              bitField0_ |= 0x00000010;
+              bitField0_ |= 0x00000008;
             }
             tag = input.readTag();
-            if (tag != 82) {
+            if (tag != 80) {
               break;
             }
           }
-          case 82: {
+          case 80: {
+            // chatType
+            final int value = input.readInt32();
+            if (ChatTypeOuterClass.ChatType.forNumber(value) != null) {
+              chatType = value;
+              bitField0_ |= 0x00000010;
+            }
+            tag = input.readTag();
+            if (tag != 58) {
+              break;
+            }
+          }
+          case 58: {
             // text
             input.readString(text);
             bitField0_ |= 0x00000020;
@@ -586,16 +586,16 @@ public final class RevcMsgScNotifyOuterClass {
         output.writeUInt32(FieldNames.fromUid, fromUid);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.toUid, toUid);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.emote, emote);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeUInt32(FieldNames.toUid, toUid);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter());
+        output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter());
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter());
+        output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter());
       }
       if ((bitField0_ & 0x00000020) != 0) {
         output.writeString(FieldNames.text, text);
@@ -622,11 +622,10 @@ public final class RevcMsgScNotifyOuterClass {
             }
             break;
           }
-          case 110520277:
-          case -868529012: {
-            if (input.isAtField(FieldNames.toUid)) {
+          case 96633208: {
+            if (input.isAtField(FieldNames.emote)) {
               if (!input.trySkipNullValue()) {
-                toUid = input.readUInt32();
+                emote = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -634,10 +633,11 @@ public final class RevcMsgScNotifyOuterClass {
             }
             break;
           }
-          case 96633208: {
-            if (input.isAtField(FieldNames.emote)) {
+          case 110520277:
+          case -868529012: {
+            if (input.isAtField(FieldNames.toUid)) {
               if (!input.trySkipNullValue()) {
-                emote = input.readUInt32();
+                toUid = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -645,23 +645,6 @@ public final class RevcMsgScNotifyOuterClass {
             }
             break;
           }
-          case 1437412018:
-          case 1620118465: {
-            if (input.isAtField(FieldNames.chatType)) {
-              if (!input.trySkipNullValue()) {
-                final ChatTypeOuterClass.ChatType value = input.readEnum(ChatTypeOuterClass.ChatType.converter());
-                if (value != null) {
-                  chatType = value.getNumber();
-                  bitField0_ |= 0x00000008;
-                } else {
-                  input.skipUnknownEnumValue();
-                }
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case 1343750747:
           case -1283380936: {
             if (input.isAtField(FieldNames.msgType)) {
@@ -669,6 +652,23 @@ public final class RevcMsgScNotifyOuterClass {
                 final MsgTypeOuterClass.MsgType value = input.readEnum(MsgTypeOuterClass.MsgType.converter());
                 if (value != null) {
                   msgType = value.getNumber();
+                  bitField0_ |= 0x00000008;
+                } else {
+                  input.skipUnknownEnumValue();
+                }
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 1437412018:
+          case 1620118465: {
+            if (input.isAtField(FieldNames.chatType)) {
+              if (!input.trySkipNullValue()) {
+                final ChatTypeOuterClass.ChatType value = input.readEnum(ChatTypeOuterClass.ChatType.converter());
+                if (value != null) {
+                  chatType = value.getNumber();
                   bitField0_ |= 0x00000010;
                 } else {
                   input.skipUnknownEnumValue();
@@ -745,14 +745,14 @@ public final class RevcMsgScNotifyOuterClass {
     static class FieldNames {
       static final FieldName fromUid = FieldName.forField("fromUid", "from_uid");
 
-      static final FieldName toUid = FieldName.forField("toUid", "to_uid");
-
       static final FieldName emote = FieldName.forField("emote");
 
-      static final FieldName chatType = FieldName.forField("chatType", "chat_type");
+      static final FieldName toUid = FieldName.forField("toUid", "to_uid");
 
       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");
     }
   }
diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java
index 2feeb7a..e2f737c 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java
@@ -18,22 +18,22 @@ public final class RogueActionOuterClass {
   public static final class RogueAction extends ProtoMessage implements Cloneable {
     private static final long serialVersionUID = 0L;
 
-    /**
-     * optional .RogueBonusSelectInfo bonus_select_info = 240;
-     */
-    private final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo bonusSelectInfo = RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo.newInstance();
-
     /**
      * 
      *  REMOVED???
      * 

      *
-     * optional .RogueMiracleSelectInfo miracle_select_info = 527;
+     * optional .RogueMiracleSelectInfo miracle_select_info = 338;
      */
     private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance();
 
     /**
-     * optional .RogueCommonBuffSelectInfo buff_select_info = 820;
+     * optional .RogueBonusSelectInfo bonus_select_info = 1035;
+     */
+    private final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo bonusSelectInfo = RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo.newInstance();
+
+    /**
+     * optional .RogueCommonBuffSelectInfo buff_select_info = 1903;
      */
     private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance();
 
@@ -53,116 +53,56 @@ public final class RogueActionOuterClass {
 
     public RogueAction clearAction() {
       if (hasAction()) {
-        clearBonusSelectInfo();
         clearMiracleSelectInfo();
+        clearBonusSelectInfo();
         clearBuffSelectInfo();
       }
       return this;
     }
 
-    private void clearActionOtherBonusSelectInfo() {
+    private void clearActionOtherMiracleSelectInfo() {
       if ((((bitField0_ & 0x00000006)) != 0)) {
-        clearMiracleSelectInfo();
+        clearBonusSelectInfo();
         clearBuffSelectInfo();
       }
     }
 
-    private void clearActionOtherMiracleSelectInfo() {
+    private void clearActionOtherBonusSelectInfo() {
       if ((((bitField0_ & 0x00000005)) != 0)) {
-        clearBonusSelectInfo();
+        clearMiracleSelectInfo();
         clearBuffSelectInfo();
       }
     }
 
     private void clearActionOtherBuffSelectInfo() {
       if ((((bitField0_ & 0x00000003)) != 0)) {
-        clearBonusSelectInfo();
         clearMiracleSelectInfo();
+        clearBonusSelectInfo();
       }
     }
 
     /**
-     * optional .RogueBonusSelectInfo bonus_select_info = 240;
-     * @return whether the bonusSelectInfo field is set
+     * 
+     *  REMOVED???
+     * 

+     *
+     * optional .RogueMiracleSelectInfo miracle_select_info = 338;
+     * @return whether the miracleSelectInfo field is set
      */
-    public boolean hasBonusSelectInfo() {
+    public boolean hasMiracleSelectInfo() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
-    /**
-     * optional .RogueBonusSelectInfo bonus_select_info = 240;
-     * @return this
-     */
-    public RogueAction clearBonusSelectInfo() {
-      bitField0_ &= ~0x00000001;
-      bonusSelectInfo.clear();
-      return this;
-    }
-
-    /**
-     * optional .RogueBonusSelectInfo bonus_select_info = 240;
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableBonusSelectInfo()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo getBonusSelectInfo() {
-      return bonusSelectInfo;
-    }
-
-    /**
-     * optional .RogueBonusSelectInfo bonus_select_info = 240;
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo getMutableBonusSelectInfo() {
-      clearActionOtherBonusSelectInfo();
-      bitField0_ |= 0x00000001;
-      return bonusSelectInfo;
-    }
-
-    /**
-     * optional .RogueBonusSelectInfo bonus_select_info = 240;
-     * @param value the bonusSelectInfo to set
-     * @return this
-     */
-    public RogueAction setBonusSelectInfo(
-        final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo value) {
-      clearActionOtherBonusSelectInfo();
-      bitField0_ |= 0x00000001;
-      bonusSelectInfo.copyFrom(value);
-      return this;
-    }
-
     /**
      * 
      *  REMOVED???
      * 

      *
-     * optional .RogueMiracleSelectInfo miracle_select_info = 527;
-     * @return whether the miracleSelectInfo field is set
-     */
-    public boolean hasMiracleSelectInfo() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * 
-     *  REMOVED???
-     * 

-     *
-     * optional .RogueMiracleSelectInfo miracle_select_info = 527;
+     * optional .RogueMiracleSelectInfo miracle_select_info = 338;
      * @return this
      */
     public RogueAction clearMiracleSelectInfo() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       miracleSelectInfo.clear();
       return this;
     }
@@ -172,7 +112,7 @@ public final class RogueActionOuterClass {
      *  REMOVED???
      * 

      *
-     * optional .RogueMiracleSelectInfo miracle_select_info = 527;
+     * optional .RogueMiracleSelectInfo miracle_select_info = 338;
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -190,7 +130,7 @@ public final class RogueActionOuterClass {
      *  REMOVED???
      *
* - * optional .RogueMiracleSelectInfo miracle_select_info = 527; + * optional .RogueMiracleSelectInfo miracle_select_info = 338; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -200,7 +140,7 @@ public final class RogueActionOuterClass { */ public RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo getMutableMiracleSelectInfo() { clearActionOtherMiracleSelectInfo(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return miracleSelectInfo; } @@ -209,20 +149,80 @@ public final class RogueActionOuterClass { * REMOVED??? * * - * optional .RogueMiracleSelectInfo miracle_select_info = 527; + * optional .RogueMiracleSelectInfo miracle_select_info = 338; * @param value the miracleSelectInfo to set * @return this */ public RogueAction setMiracleSelectInfo( final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo value) { clearActionOtherMiracleSelectInfo(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; miracleSelectInfo.copyFrom(value); return this; } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * optional .RogueBonusSelectInfo bonus_select_info = 1035; + * @return whether the bonusSelectInfo field is set + */ + public boolean hasBonusSelectInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RogueBonusSelectInfo bonus_select_info = 1035; + * @return this + */ + public RogueAction clearBonusSelectInfo() { + bitField0_ &= ~0x00000002; + bonusSelectInfo.clear(); + return this; + } + + /** + * optional .RogueBonusSelectInfo bonus_select_info = 1035; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableBonusSelectInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo getBonusSelectInfo() { + return bonusSelectInfo; + } + + /** + * optional .RogueBonusSelectInfo bonus_select_info = 1035; + * + * 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 RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo getMutableBonusSelectInfo() { + clearActionOtherBonusSelectInfo(); + bitField0_ |= 0x00000002; + return bonusSelectInfo; + } + + /** + * optional .RogueBonusSelectInfo bonus_select_info = 1035; + * @param value the bonusSelectInfo to set + * @return this + */ + public RogueAction setBonusSelectInfo( + final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo value) { + clearActionOtherBonusSelectInfo(); + bitField0_ |= 0x00000002; + bonusSelectInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueCommonBuffSelectInfo buff_select_info = 1903; * @return whether the buffSelectInfo field is set */ public boolean hasBuffSelectInfo() { @@ -230,7 +230,7 @@ public final class RogueActionOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * optional .RogueCommonBuffSelectInfo buff_select_info = 1903; * @return this */ public RogueAction clearBuffSelectInfo() { @@ -240,7 +240,7 @@ public final class RogueActionOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * optional .RogueCommonBuffSelectInfo buff_select_info = 1903; * * This 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 RogueActionOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * optional .RogueCommonBuffSelectInfo buff_select_info = 1903; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -270,7 +270,7 @@ public final class RogueActionOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * optional .RogueCommonBuffSelectInfo buff_select_info = 1903; * @param value the buffSelectInfo to set * @return this */ @@ -287,8 +287,8 @@ public final class RogueActionOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - bonusSelectInfo.copyFrom(other.bonusSelectInfo); miracleSelectInfo.copyFrom(other.miracleSelectInfo); + bonusSelectInfo.copyFrom(other.bonusSelectInfo); buffSelectInfo.copyFrom(other.buffSelectInfo); } return this; @@ -300,12 +300,12 @@ public final class RogueActionOuterClass { return this; } cachedSize = -1; - if (other.hasBonusSelectInfo()) { - getMutableBonusSelectInfo().mergeFrom(other.bonusSelectInfo); - } if (other.hasMiracleSelectInfo()) { getMutableMiracleSelectInfo().mergeFrom(other.miracleSelectInfo); } + if (other.hasBonusSelectInfo()) { + getMutableBonusSelectInfo().mergeFrom(other.bonusSelectInfo); + } if (other.hasBuffSelectInfo()) { getMutableBuffSelectInfo().mergeFrom(other.buffSelectInfo); } @@ -319,8 +319,8 @@ public final class RogueActionOuterClass { } cachedSize = -1; bitField0_ = 0; - bonusSelectInfo.clear(); miracleSelectInfo.clear(); + bonusSelectInfo.clear(); buffSelectInfo.clear(); return this; } @@ -332,8 +332,8 @@ public final class RogueActionOuterClass { } cachedSize = -1; bitField0_ = 0; - bonusSelectInfo.clearQuick(); miracleSelectInfo.clearQuick(); + bonusSelectInfo.clearQuick(); buffSelectInfo.clearQuick(); return this; } @@ -348,23 +348,23 @@ public final class RogueActionOuterClass { } RogueAction other = (RogueAction) o; return bitField0_ == other.bitField0_ - && (!hasBonusSelectInfo() || bonusSelectInfo.equals(other.bonusSelectInfo)) && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)) + && (!hasBonusSelectInfo() || bonusSelectInfo.equals(other.bonusSelectInfo)) && (!hasBuffSelectInfo() || buffSelectInfo.equals(other.buffSelectInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 3970); - output.writeMessageNoTag(bonusSelectInfo); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 8442); + output.writeRawLittleEndian16((short) 5522); output.writeMessageNoTag(miracleSelectInfo); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawLittleEndian16((short) 16602); + output.writeMessageNoTag(bonusSelectInfo); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 13218); + output.writeRawLittleEndian16((short) 30458); output.writeMessageNoTag(buffSelectInfo); } } @@ -373,10 +373,10 @@ public final class RogueActionOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); @@ -391,27 +391,27 @@ public final class RogueActionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 1922: { - // bonusSelectInfo - clearActionOtherBonusSelectInfo(); - input.readMessage(bonusSelectInfo); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 4218) { - break; - } - } - case 4218: { + case 2706: { // miracleSelectInfo clearActionOtherMiracleSelectInfo(); input.readMessage(miracleSelectInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 6562) { + if (tag != 8282) { break; } } - case 6562: { + case 8282: { + // bonusSelectInfo + clearActionOtherBonusSelectInfo(); + input.readMessage(bonusSelectInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 15226) { + break; + } + } + case 15226: { // buffSelectInfo clearActionOtherBuffSelectInfo(); input.readMessage(buffSelectInfo); @@ -439,10 +439,10 @@ 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.miracleSelectInfo, miracleSelectInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); + output.writeMessage(FieldNames.bonusSelectInfo, bonusSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); @@ -457,12 +457,12 @@ public final class RogueActionOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1283182921: - case -1836716559: { - if (input.isAtField(FieldNames.bonusSelectInfo)) { + case -1009314021: + case -1608054973: { + if (input.isAtField(FieldNames.miracleSelectInfo)) { if (!input.trySkipNullValue()) { - clearActionOtherBonusSelectInfo(); - input.readMessage(bonusSelectInfo); + clearActionOtherMiracleSelectInfo(); + input.readMessage(miracleSelectInfo); bitField0_ |= 0x00000001; } } else { @@ -470,12 +470,12 @@ public final class RogueActionOuterClass { } break; } - case -1009314021: - case -1608054973: { - if (input.isAtField(FieldNames.miracleSelectInfo)) { + case 1283182921: + case -1836716559: { + if (input.isAtField(FieldNames.bonusSelectInfo)) { if (!input.trySkipNullValue()) { - clearActionOtherMiracleSelectInfo(); - input.readMessage(miracleSelectInfo); + clearActionOtherBonusSelectInfo(); + input.readMessage(bonusSelectInfo); bitField0_ |= 0x00000002; } } else { @@ -548,10 +548,10 @@ public final class RogueActionOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName bonusSelectInfo = FieldName.forField("bonusSelectInfo", "bonus_select_info"); - static final FieldName miracleSelectInfo = FieldName.forField("miracleSelectInfo", "miracle_select_info"); + static final FieldName bonusSelectInfo = FieldName.forField("bonusSelectInfo", "bonus_select_info"); + static final FieldName buffSelectInfo = FieldName.forField("buffSelectInfo", "buff_select_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java index de64c07..74c4d04 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java @@ -19,21 +19,21 @@ public final class RogueActionResultDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueVirtualItemData remove_item_list = 2; - */ - private final RogueVirtualItemDataOuterClass.RogueVirtualItemData removeItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance(); - - /** - * optional .RogueVirtualItemData add_item_list = 6; + * optional .RogueVirtualItemData add_item_list = 4; */ private final RogueVirtualItemDataOuterClass.RogueVirtualItemData addItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance(); + /** + * optional .RogueVirtualItemData remove_item_list = 10; + */ + private final RogueVirtualItemDataOuterClass.RogueVirtualItemData removeItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance(); + /** * 
-     *  1263, 217 or 265
+     *  idk
      *
* - * optional .RogueMiracleData add_miracle_list = 217; + * optional .RogueMiracleData add_miracle_list = 11; */ private final RogueMiracleDataOuterClass.RogueMiracleData addMiracleList = RogueMiracleDataOuterClass.RogueMiracleData.newInstance(); @@ -63,8 +63,8 @@ public final class RogueActionResultDataOuterClass { public RogueActionResultData clearResultAction() { if (hasResultAction()) { - clearRemoveItemList(); clearAddItemList(); + clearRemoveItemList(); clearAddMiracleList(); clearRemoveBuffList(); clearAddBuffList(); @@ -72,18 +72,18 @@ public final class RogueActionResultDataOuterClass { return this; } - private void clearResultActionOtherRemoveItemList() { + private void clearResultActionOtherAddItemList() { if ((((bitField0_ & 0x0000001e)) != 0)) { - clearAddItemList(); + clearRemoveItemList(); clearAddMiracleList(); clearRemoveBuffList(); clearAddBuffList(); } } - private void clearResultActionOtherAddItemList() { + private void clearResultActionOtherRemoveItemList() { if ((((bitField0_ & 0x0000001d)) != 0)) { - clearRemoveItemList(); + clearAddItemList(); clearAddMiracleList(); clearRemoveBuffList(); clearAddBuffList(); @@ -92,8 +92,8 @@ public final class RogueActionResultDataOuterClass { private void clearResultActionOtherAddMiracleList() { if ((((bitField0_ & 0x0000001b)) != 0)) { - clearRemoveItemList(); clearAddItemList(); + clearRemoveItemList(); clearRemoveBuffList(); clearAddBuffList(); } @@ -101,8 +101,8 @@ public final class RogueActionResultDataOuterClass { private void clearResultActionOtherRemoveBuffList() { if ((((bitField0_ & 0x00000017)) != 0)) { - clearRemoveItemList(); clearAddItemList(); + clearRemoveItemList(); clearAddMiracleList(); clearAddBuffList(); } @@ -110,93 +110,33 @@ public final class RogueActionResultDataOuterClass { private void clearResultActionOtherAddBuffList() { if ((((bitField0_ & 0x0000000f)) != 0)) { - clearRemoveItemList(); clearAddItemList(); + clearRemoveItemList(); clearAddMiracleList(); clearRemoveBuffList(); } } /** - * optional .RogueVirtualItemData remove_item_list = 2; - * @return whether the removeItemList field is set + * optional .RogueVirtualItemData add_item_list = 4; + * @return whether the addItemList field is set */ - public boolean hasRemoveItemList() { + public boolean hasAddItemList() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueVirtualItemData remove_item_list = 2; - * @return this - */ - public RogueActionResultData clearRemoveItemList() { - bitField0_ &= ~0x00000001; - removeItemList.clear(); - return this; - } - - /** - * optional .RogueVirtualItemData remove_item_list = 2; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRemoveItemList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueVirtualItemDataOuterClass.RogueVirtualItemData getRemoveItemList() { - return removeItemList; - } - - /** - * optional .RogueVirtualItemData remove_item_list = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableRemoveItemList() { - clearResultActionOtherRemoveItemList(); - bitField0_ |= 0x00000001; - return removeItemList; - } - - /** - * optional .RogueVirtualItemData remove_item_list = 2; - * @param value the removeItemList to set - * @return this - */ - public RogueActionResultData setRemoveItemList( - final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) { - clearResultActionOtherRemoveItemList(); - bitField0_ |= 0x00000001; - removeItemList.copyFrom(value); - return this; - } - - /** - * optional .RogueVirtualItemData add_item_list = 6; - * @return whether the addItemList field is set - */ - public boolean hasAddItemList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueVirtualItemData add_item_list = 6; + * optional .RogueVirtualItemData add_item_list = 4; * @return this */ public RogueActionResultData clearAddItemList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; addItemList.clear(); return this; } /** - * optional .RogueVirtualItemData add_item_list = 6; + * optional .RogueVirtualItemData add_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. @@ -210,7 +150,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData add_item_list = 6; + * optional .RogueVirtualItemData add_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 @@ -220,29 +160,89 @@ public final class RogueActionResultDataOuterClass { */ public RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableAddItemList() { clearResultActionOtherAddItemList(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return addItemList; } /** - * optional .RogueVirtualItemData add_item_list = 6; + * optional .RogueVirtualItemData add_item_list = 4; * @param value the addItemList to set * @return this */ public RogueActionResultData setAddItemList( final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) { clearResultActionOtherAddItemList(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; addItemList.copyFrom(value); return this; } + /** + * optional .RogueVirtualItemData remove_item_list = 10; + * @return whether the removeItemList field is set + */ + public boolean hasRemoveItemList() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RogueVirtualItemData remove_item_list = 10; + * @return this + */ + public RogueActionResultData clearRemoveItemList() { + bitField0_ &= ~0x00000002; + removeItemList.clear(); + return this; + } + + /** + * optional .RogueVirtualItemData remove_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. + * + * Use {@link #getMutableRemoveItemList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueVirtualItemDataOuterClass.RogueVirtualItemData getRemoveItemList() { + return removeItemList; + } + + /** + * optional .RogueVirtualItemData remove_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableRemoveItemList() { + clearResultActionOtherRemoveItemList(); + bitField0_ |= 0x00000002; + return removeItemList; + } + + /** + * optional .RogueVirtualItemData remove_item_list = 10; + * @param value the removeItemList to set + * @return this + */ + public RogueActionResultData setRemoveItemList( + final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) { + clearResultActionOtherRemoveItemList(); + bitField0_ |= 0x00000002; + removeItemList.copyFrom(value); + return this; + } + /** * 
-     *  1263, 217 or 265
+     *  idk
      *
* - * optional .RogueMiracleData add_miracle_list = 217; + * optional .RogueMiracleData add_miracle_list = 11; * @return whether the addMiracleList field is set */ public boolean hasAddMiracleList() { @@ -251,10 +251,10 @@ public final class RogueActionResultDataOuterClass { /** * 
-     *  1263, 217 or 265
+     *  idk
      *
* - * optional .RogueMiracleData add_miracle_list = 217; + * optional .RogueMiracleData add_miracle_list = 11; * @return this */ public RogueActionResultData clearAddMiracleList() { @@ -265,10 +265,10 @@ public final class RogueActionResultDataOuterClass { /** * 
-     *  1263, 217 or 265
+     *  idk
      *
* - * optional .RogueMiracleData add_miracle_list = 217; + * optional .RogueMiracleData add_miracle_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. @@ -283,10 +283,10 @@ public final class RogueActionResultDataOuterClass { /** * 
-     *  1263, 217 or 265
+     *  idk
      *
* - * optional .RogueMiracleData add_miracle_list = 217; + * optional .RogueMiracleData add_miracle_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 @@ -302,10 +302,10 @@ public final class RogueActionResultDataOuterClass { /** * 
-     *  1263, 217 or 265
+     *  idk
      *
* - * optional .RogueMiracleData add_miracle_list = 217; + * optional .RogueMiracleData add_miracle_list = 11; * @param value the addMiracleList to set * @return this */ @@ -441,8 +441,8 @@ public final class RogueActionResultDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - removeItemList.copyFrom(other.removeItemList); addItemList.copyFrom(other.addItemList); + removeItemList.copyFrom(other.removeItemList); addMiracleList.copyFrom(other.addMiracleList); removeBuffList.copyFrom(other.removeBuffList); addBuffList.copyFrom(other.addBuffList); @@ -456,12 +456,12 @@ public final class RogueActionResultDataOuterClass { return this; } cachedSize = -1; - if (other.hasRemoveItemList()) { - getMutableRemoveItemList().mergeFrom(other.removeItemList); - } if (other.hasAddItemList()) { getMutableAddItemList().mergeFrom(other.addItemList); } + if (other.hasRemoveItemList()) { + getMutableRemoveItemList().mergeFrom(other.removeItemList); + } if (other.hasAddMiracleList()) { getMutableAddMiracleList().mergeFrom(other.addMiracleList); } @@ -481,8 +481,8 @@ public final class RogueActionResultDataOuterClass { } cachedSize = -1; bitField0_ = 0; - removeItemList.clear(); addItemList.clear(); + removeItemList.clear(); addMiracleList.clear(); removeBuffList.clear(); addBuffList.clear(); @@ -496,8 +496,8 @@ public final class RogueActionResultDataOuterClass { } cachedSize = -1; bitField0_ = 0; - removeItemList.clearQuick(); addItemList.clearQuick(); + removeItemList.clearQuick(); addMiracleList.clearQuick(); removeBuffList.clearQuick(); addBuffList.clearQuick(); @@ -514,8 +514,8 @@ public final class RogueActionResultDataOuterClass { } RogueActionResultData other = (RogueActionResultData) o; return bitField0_ == other.bitField0_ - && (!hasRemoveItemList() || removeItemList.equals(other.removeItemList)) && (!hasAddItemList() || addItemList.equals(other.addItemList)) + && (!hasRemoveItemList() || removeItemList.equals(other.removeItemList)) && (!hasAddMiracleList() || addMiracleList.equals(other.addMiracleList)) && (!hasRemoveBuffList() || removeBuffList.equals(other.removeBuffList)) && (!hasAddBuffList() || addBuffList.equals(other.addBuffList)); @@ -524,15 +524,15 @@ public final class RogueActionResultDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(removeItemList); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 34); output.writeMessageNoTag(addItemList); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(removeItemList); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 3530); + output.writeRawByte((byte) 90); output.writeMessageNoTag(addMiracleList); } if ((bitField0_ & 0x00000008) != 0) { @@ -549,13 +549,13 @@ public final class RogueActionResultDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(removeItemList); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(addItemList); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(removeItemList); + } if ((bitField0_ & 0x00000004) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(addMiracleList); + size += 1 + ProtoSink.computeMessageSizeNoTag(addMiracleList); } if ((bitField0_ & 0x00000008) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(removeBuffList); @@ -573,27 +573,27 @@ public final class RogueActionResultDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { - // removeItemList - clearResultActionOtherRemoveItemList(); - input.readMessage(removeItemList); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { + case 34: { // addItemList clearResultActionOtherAddItemList(); input.readMessage(addItemList); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 1738) { + if (tag != 82) { break; } } - case 1738: { + case 82: { + // removeItemList + clearResultActionOtherRemoveItemList(); + input.readMessage(removeItemList); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // addMiracleList clearResultActionOtherAddMiracleList(); input.readMessage(addMiracleList); @@ -641,10 +641,10 @@ public final class RogueActionResultDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.removeItemList, removeItemList); + output.writeMessage(FieldNames.addItemList, addItemList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.addItemList, addItemList); + output.writeMessage(FieldNames.removeItemList, removeItemList); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.addMiracleList, addMiracleList); @@ -665,12 +665,12 @@ public final class RogueActionResultDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -417171723: - case -293666737: { - if (input.isAtField(FieldNames.removeItemList)) { + case 203000338: + case -1308770260: { + if (input.isAtField(FieldNames.addItemList)) { if (!input.trySkipNullValue()) { - clearResultActionOtherRemoveItemList(); - input.readMessage(removeItemList); + clearResultActionOtherAddItemList(); + input.readMessage(addItemList); bitField0_ |= 0x00000001; } } else { @@ -678,12 +678,12 @@ public final class RogueActionResultDataOuterClass { } break; } - case 203000338: - case -1308770260: { - if (input.isAtField(FieldNames.addItemList)) { + case -417171723: + case -293666737: { + if (input.isAtField(FieldNames.removeItemList)) { if (!input.trySkipNullValue()) { - clearResultActionOtherAddItemList(); - input.readMessage(addItemList); + clearResultActionOtherRemoveItemList(); + input.readMessage(removeItemList); bitField0_ |= 0x00000002; } } else { @@ -783,10 +783,10 @@ public final class RogueActionResultDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName removeItemList = FieldName.forField("removeItemList", "remove_item_list"); - static final FieldName addItemList = FieldName.forField("addItemList", "add_item_list"); + static final FieldName removeItemList = FieldName.forField("removeItemList", "remove_item_list"); + static final FieldName addMiracleList = FieldName.forField("addMiracleList", "add_miracle_list"); static final FieldName removeBuffList = FieldName.forField("removeBuffList", "remove_buff_list"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java index 561da75..459b869 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java @@ -19,12 +19,12 @@ public final class RogueActionResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueBuffSource source = 11; + * optional .RogueBuffSource source = 2; */ private int source; /** - * optional .RogueActionResultData rogue_action = 4; + * optional .RogueActionResultData rogue_action = 7; */ private final RogueActionResultDataOuterClass.RogueActionResultData rogueAction = RogueActionResultDataOuterClass.RogueActionResultData.newInstance(); @@ -39,7 +39,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 11; + * optional .RogueBuffSource source = 2; * @return whether the source field is set */ public boolean hasSource() { @@ -47,7 +47,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 11; + * optional .RogueBuffSource source = 2; * @return this */ public RogueActionResult clearSource() { @@ -57,7 +57,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 11; + * optional .RogueBuffSource source = 2; * @return the source */ public RogueBuffSourceOuterClass.RogueBuffSource getSource() { @@ -90,7 +90,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 11; + * optional .RogueBuffSource source = 2; * @param value the source to set * @return this */ @@ -101,7 +101,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 4; + * optional .RogueActionResultData rogue_action = 7; * @return whether the rogueAction field is set */ public boolean hasRogueAction() { @@ -109,7 +109,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 4; + * optional .RogueActionResultData rogue_action = 7; * @return this */ public RogueActionResult clearRogueAction() { @@ -119,7 +119,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 4; + * optional .RogueActionResultData 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. @@ -133,7 +133,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 4; + * optional .RogueActionResultData 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 @@ -147,7 +147,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 4; + * optional .RogueActionResultData rogue_action = 7; * @param value the rogueAction to set * @return this */ @@ -224,11 +224,11 @@ public final class RogueActionResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeEnumNoTag(source); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 58); output.writeMessageNoTag(rogueAction); } } @@ -252,7 +252,7 @@ public final class RogueActionResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 16: { // source final int value = input.readInt32(); if (RogueBuffSourceOuterClass.RogueBuffSource.forNumber(value) != null) { @@ -260,11 +260,11 @@ public final class RogueActionResultOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 34) { + if (tag != 58) { break; } } - case 34: { + case 58: { // rogueAction input.readMessage(rogueAction); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java index 9b611eb..5717dd7 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java @@ -20,22 +20,22 @@ public final class RogueAeonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unlock_aeon_enhance_num = 9; + * optional uint32 unlock_aeon_enhance_num = 4; */ private int unlockAeonEnhanceNum; /** - * optional uint32 unlock_aeon_num = 10; + * optional uint32 unlock_aeon_num = 15; */ private int unlockAeonNum; /** - * optional bool is_unlocked = 5; + * optional bool is_unlocked = 7; */ private boolean isUnlocked; /** - * repeated uint32 aeon_id_list = 7; + * repeated uint32 aeon_id_list = 13; */ private final RepeatedInt aeonIdList = RepeatedInt.newEmptyInstance(); @@ -50,7 +50,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 9; + * optional uint32 unlock_aeon_enhance_num = 4; * @return whether the unlockAeonEnhanceNum field is set */ public boolean hasUnlockAeonEnhanceNum() { @@ -58,7 +58,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 9; + * optional uint32 unlock_aeon_enhance_num = 4; * @return this */ public RogueAeonInfo clearUnlockAeonEnhanceNum() { @@ -68,7 +68,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 9; + * optional uint32 unlock_aeon_enhance_num = 4; * @return the unlockAeonEnhanceNum */ public int getUnlockAeonEnhanceNum() { @@ -76,7 +76,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 9; + * optional uint32 unlock_aeon_enhance_num = 4; * @param value the unlockAeonEnhanceNum to set * @return this */ @@ -87,7 +87,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 10; + * optional uint32 unlock_aeon_num = 15; * @return whether the unlockAeonNum field is set */ public boolean hasUnlockAeonNum() { @@ -95,7 +95,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 10; + * optional uint32 unlock_aeon_num = 15; * @return this */ public RogueAeonInfo clearUnlockAeonNum() { @@ -105,7 +105,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 10; + * optional uint32 unlock_aeon_num = 15; * @return the unlockAeonNum */ public int getUnlockAeonNum() { @@ -113,7 +113,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 10; + * optional uint32 unlock_aeon_num = 15; * @param value the unlockAeonNum to set * @return this */ @@ -124,7 +124,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 5; + * optional bool is_unlocked = 7; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -132,7 +132,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 5; + * optional bool is_unlocked = 7; * @return this */ public RogueAeonInfo clearIsUnlocked() { @@ -142,7 +142,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 5; + * optional bool is_unlocked = 7; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -150,7 +150,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 5; + * optional bool is_unlocked = 7; * @param value the isUnlocked to set * @return this */ @@ -161,7 +161,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 7; + * repeated uint32 aeon_id_list = 13; * @return whether the aeonIdList field is set */ public boolean hasAeonIdList() { @@ -169,7 +169,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 7; + * repeated uint32 aeon_id_list = 13; * @return this */ public RogueAeonInfo clearAeonIdList() { @@ -179,7 +179,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 7; + * repeated uint32 aeon_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. @@ -193,7 +193,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 7; + * repeated uint32 aeon_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 @@ -207,7 +207,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 7; + * repeated uint32 aeon_id_list = 13; * @param value the aeonIdList to add * @return this */ @@ -218,7 +218,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 7; + * repeated uint32 aeon_id_list = 13; * @param values the aeonIdList to add * @return this */ @@ -306,20 +306,20 @@ public final class RogueAeonInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(unlockAeonNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeBoolNoTag(isUnlocked); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < aeonIdList.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(aeonIdList.array()[i]); } } @@ -350,34 +350,34 @@ public final class RogueAeonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // unlockAeonEnhanceNum unlockAeonEnhanceNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { + case 120: { // unlockAeonNum unlockAeonNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { + case 56: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 58) { + if (tag != 106) { break; } } - case 58: { + case 106: { // aeonIdList [packed=true] input.readPackedUInt32(aeonIdList, tag); bitField0_ |= 0x00000008; @@ -396,7 +396,7 @@ public final class RogueAeonInfoOuterClass { tag = input.readTag(); break; } - case 56: { + case 104: { // aeonIdList [packed=false] tag = input.readRepeatedUInt32(aeonIdList, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java index cec6081..8a83e2b 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java @@ -19,17 +19,17 @@ public final class RogueAeonOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 aeon_id = 10; - */ - private int aeonId; - - /** - * optional uint32 unlock_aeon_enhance_num = 13; + * optional uint32 unlock_aeon_enhance_num = 3; */ private int unlockAeonEnhanceNum; /** - * optional bool is_unlock_enhance_buff = 3; + * optional uint32 aeon_id = 15; + */ + private int aeonId; + + /** + * optional bool is_unlock_enhance_buff = 10; */ private boolean isUnlockEnhanceBuff; @@ -44,62 +44,25 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 10; - * @return whether the aeonId field is set + * optional uint32 unlock_aeon_enhance_num = 3; + * @return whether the unlockAeonEnhanceNum field is set */ - public boolean hasAeonId() { + public boolean hasUnlockAeonEnhanceNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 aeon_id = 10; - * @return this - */ - public RogueAeon clearAeonId() { - bitField0_ &= ~0x00000001; - aeonId = 0; - return this; - } - - /** - * optional uint32 aeon_id = 10; - * @return the aeonId - */ - public int getAeonId() { - return aeonId; - } - - /** - * optional uint32 aeon_id = 10; - * @param value the aeonId to set - * @return this - */ - public RogueAeon setAeonId(final int value) { - bitField0_ |= 0x00000001; - aeonId = value; - return this; - } - - /** - * optional uint32 unlock_aeon_enhance_num = 13; - * @return whether the unlockAeonEnhanceNum field is set - */ - public boolean hasUnlockAeonEnhanceNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 unlock_aeon_enhance_num = 13; + * optional uint32 unlock_aeon_enhance_num = 3; * @return this */ public RogueAeon clearUnlockAeonEnhanceNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; unlockAeonEnhanceNum = 0; return this; } /** - * optional uint32 unlock_aeon_enhance_num = 13; + * optional uint32 unlock_aeon_enhance_num = 3; * @return the unlockAeonEnhanceNum */ public int getUnlockAeonEnhanceNum() { @@ -107,18 +70,55 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 13; + * optional uint32 unlock_aeon_enhance_num = 3; * @param value the unlockAeonEnhanceNum to set * @return this */ public RogueAeon setUnlockAeonEnhanceNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; unlockAeonEnhanceNum = value; return this; } /** - * optional bool is_unlock_enhance_buff = 3; + * optional uint32 aeon_id = 15; + * @return whether the aeonId field is set + */ + public boolean hasAeonId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 aeon_id = 15; + * @return this + */ + public RogueAeon clearAeonId() { + bitField0_ &= ~0x00000002; + aeonId = 0; + return this; + } + + /** + * optional uint32 aeon_id = 15; + * @return the aeonId + */ + public int getAeonId() { + return aeonId; + } + + /** + * optional uint32 aeon_id = 15; + * @param value the aeonId to set + * @return this + */ + public RogueAeon setAeonId(final int value) { + bitField0_ |= 0x00000002; + aeonId = value; + return this; + } + + /** + * optional bool is_unlock_enhance_buff = 10; * @return whether the isUnlockEnhanceBuff field is set */ public boolean hasIsUnlockEnhanceBuff() { @@ -126,7 +126,7 @@ public final class RogueAeonOuterClass { } /** - * optional bool is_unlock_enhance_buff = 3; + * optional bool is_unlock_enhance_buff = 10; * @return this */ public RogueAeon clearIsUnlockEnhanceBuff() { @@ -136,7 +136,7 @@ public final class RogueAeonOuterClass { } /** - * optional bool is_unlock_enhance_buff = 3; + * optional bool is_unlock_enhance_buff = 10; * @return the isUnlockEnhanceBuff */ public boolean getIsUnlockEnhanceBuff() { @@ -144,7 +144,7 @@ public final class RogueAeonOuterClass { } /** - * optional bool is_unlock_enhance_buff = 3; + * optional bool is_unlock_enhance_buff = 10; * @param value the isUnlockEnhanceBuff to set * @return this */ @@ -159,8 +159,8 @@ public final class RogueAeonOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - aeonId = other.aeonId; unlockAeonEnhanceNum = other.unlockAeonEnhanceNum; + aeonId = other.aeonId; isUnlockEnhanceBuff = other.isUnlockEnhanceBuff; } return this; @@ -172,12 +172,12 @@ public final class RogueAeonOuterClass { return this; } cachedSize = -1; - if (other.hasAeonId()) { - setAeonId(other.aeonId); - } if (other.hasUnlockAeonEnhanceNum()) { setUnlockAeonEnhanceNum(other.unlockAeonEnhanceNum); } + if (other.hasAeonId()) { + setAeonId(other.aeonId); + } if (other.hasIsUnlockEnhanceBuff()) { setIsUnlockEnhanceBuff(other.isUnlockEnhanceBuff); } @@ -191,8 +191,8 @@ public final class RogueAeonOuterClass { } cachedSize = -1; bitField0_ = 0; - aeonId = 0; unlockAeonEnhanceNum = 0; + aeonId = 0; isUnlockEnhanceBuff = false; return this; } @@ -217,23 +217,23 @@ public final class RogueAeonOuterClass { } RogueAeon other = (RogueAeon) o; return bitField0_ == other.bitField0_ - && (!hasAeonId() || aeonId == other.aeonId) && (!hasUnlockAeonEnhanceNum() || unlockAeonEnhanceNum == other.unlockAeonEnhanceNum) + && (!hasAeonId() || aeonId == other.aeonId) && (!hasIsUnlockEnhanceBuff() || isUnlockEnhanceBuff == other.isUnlockEnhanceBuff); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(aeonId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(unlockAeonEnhanceNum); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(aeonId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isUnlockEnhanceBuff); } } @@ -242,10 +242,10 @@ public final class RogueAeonOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public final class RogueAeonOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // aeonId - aeonId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 24: { // unlockAeonEnhanceNum unlockAeonEnhanceNum = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 120) { break; } } - case 24: { + case 120: { + // aeonId + aeonId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // isUnlockEnhanceBuff isUnlockEnhanceBuff = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class RogueAeonOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.aeonId, aeonId); + output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum); + output.writeUInt32(FieldNames.aeonId, aeonId); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isUnlockEnhanceBuff, isUnlockEnhanceBuff); @@ -323,11 +323,11 @@ public final class RogueAeonOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1421249154: - case -1109029417: { - if (input.isAtField(FieldNames.aeonId)) { + case 1040991167: + case 7773396: { + if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) { if (!input.trySkipNullValue()) { - aeonId = input.readUInt32(); + unlockAeonEnhanceNum = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class RogueAeonOuterClass { } break; } - case 1040991167: - case 7773396: { - if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) { + case -1421249154: + case -1109029417: { + if (input.isAtField(FieldNames.aeonId)) { if (!input.trySkipNullValue()) { - unlockAeonEnhanceNum = input.readUInt32(); + aeonId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public final class RogueAeonOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); - static final FieldName unlockAeonEnhanceNum = FieldName.forField("unlockAeonEnhanceNum", "unlock_aeon_enhance_num"); + static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); + static final FieldName isUnlockEnhanceBuff = FieldName.forField("isUnlockEnhanceBuff", "is_unlock_enhance_buff"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java index 8dad0eb..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 = 11; + * 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 = 11; + * 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 = 11; + * repeated .RogueArea rogue_area = 2; * @return this */ public RogueAreaInfo clearRogueArea() { @@ -53,7 +53,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 11; + * 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 = 11; + * 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 = 11; + * 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 = 11; + * 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) 90); + 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 90: { + 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 e4f4238..83e1ece 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_status = 5; + * optional uint32 rogue_status = 2; */ private int rogueStatus; /** - * optional uint32 area_id = 9; + * optional uint32 area_id = 3; */ private int areaId; + /** + * optional uint32 map_id = 5; + */ + private int mapId; + + /** + * optional uint32 rogue_area_status = 9; + */ + private int rogueAreaStatus; + /** * optional uint32 cur_reach_room_num = 10; */ private int curReachRoomNum; /** - * optional uint32 map_id = 13; - */ - private int mapId; - - /** - * optional uint32 rogue_area_status = 15; - */ - private int rogueAreaStatus; - - /** - * optional bool has_taken_rewards = 4; + * optional bool has_taken_rewards = 13; */ private boolean hasTakenRewards; @@ -59,7 +59,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_status = 5; + * optional uint32 rogue_status = 2; * @return whether the rogueStatus field is set */ public boolean hasRogueStatus() { @@ -67,7 +67,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_status = 5; + * optional uint32 rogue_status = 2; * @return this */ public RogueArea clearRogueStatus() { @@ -77,7 +77,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_status = 5; + * optional uint32 rogue_status = 2; * @return the rogueStatus */ public int getRogueStatus() { @@ -85,7 +85,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_status = 5; + * optional uint32 rogue_status = 2; * @param value the rogueStatus to set * @return this */ @@ -96,7 +96,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 area_id = 9; + * optional uint32 area_id = 3; * @return whether the areaId field is set */ public boolean hasAreaId() { @@ -104,7 +104,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 area_id = 9; + * optional uint32 area_id = 3; * @return this */ public RogueArea clearAreaId() { @@ -114,7 +114,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 area_id = 9; + * optional uint32 area_id = 3; * @return the areaId */ public int getAreaId() { @@ -122,7 +122,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 area_id = 9; + * optional uint32 area_id = 3; * @param value the areaId to set * @return this */ @@ -132,12 +132,86 @@ public final class RogueAreaOuterClass { return this; } + /** + * optional uint32 map_id = 5; + * @return whether the mapId field is set + */ + public boolean hasMapId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 map_id = 5; + * @return this + */ + public RogueArea clearMapId() { + bitField0_ &= ~0x00000004; + mapId = 0; + return this; + } + + /** + * optional uint32 map_id = 5; + * @return the mapId + */ + public int getMapId() { + return mapId; + } + + /** + * optional uint32 map_id = 5; + * @param value the mapId to set + * @return this + */ + public RogueArea setMapId(final int value) { + bitField0_ |= 0x00000004; + mapId = value; + return this; + } + + /** + * optional uint32 rogue_area_status = 9; + * @return whether the rogueAreaStatus field is set + */ + public boolean hasRogueAreaStatus() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 rogue_area_status = 9; + * @return this + */ + public RogueArea clearRogueAreaStatus() { + bitField0_ &= ~0x00000008; + rogueAreaStatus = 0; + return this; + } + + /** + * optional uint32 rogue_area_status = 9; + * @return the rogueAreaStatus + */ + public int getRogueAreaStatus() { + return rogueAreaStatus; + } + + /** + * optional uint32 rogue_area_status = 9; + * @param value the rogueAreaStatus to set + * @return this + */ + public RogueArea setRogueAreaStatus(final int value) { + bitField0_ |= 0x00000008; + rogueAreaStatus = value; + return this; + } + /** * optional uint32 cur_reach_room_num = 10; * @return whether the curReachRoomNum field is set */ public boolean hasCurReachRoomNum() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -145,7 +219,7 @@ public final class RogueAreaOuterClass { * @return this */ public RogueArea clearCurReachRoomNum() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000010; curReachRoomNum = 0; return this; } @@ -164,87 +238,13 @@ public final class RogueAreaOuterClass { * @return this */ public RogueArea setCurReachRoomNum(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000010; curReachRoomNum = value; return this; } /** - * optional uint32 map_id = 13; - * @return whether the mapId field is set - */ - public boolean hasMapId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 map_id = 13; - * @return this - */ - public RogueArea clearMapId() { - bitField0_ &= ~0x00000008; - mapId = 0; - return this; - } - - /** - * optional uint32 map_id = 13; - * @return the mapId - */ - public int getMapId() { - return mapId; - } - - /** - * optional uint32 map_id = 13; - * @param value the mapId to set - * @return this - */ - public RogueArea setMapId(final int value) { - bitField0_ |= 0x00000008; - mapId = value; - return this; - } - - /** - * optional uint32 rogue_area_status = 15; - * @return whether the rogueAreaStatus field is set - */ - public boolean hasRogueAreaStatus() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 rogue_area_status = 15; - * @return this - */ - public RogueArea clearRogueAreaStatus() { - bitField0_ &= ~0x00000010; - rogueAreaStatus = 0; - return this; - } - - /** - * optional uint32 rogue_area_status = 15; - * @return the rogueAreaStatus - */ - public int getRogueAreaStatus() { - return rogueAreaStatus; - } - - /** - * optional uint32 rogue_area_status = 15; - * @param value the rogueAreaStatus to set - * @return this - */ - public RogueArea setRogueAreaStatus(final int value) { - bitField0_ |= 0x00000010; - rogueAreaStatus = value; - return this; - } - - /** - * optional bool has_taken_rewards = 4; + * optional bool has_taken_rewards = 13; * @return whether the hasTakenRewards field is set */ public boolean hasHasTakenRewards() { @@ -252,7 +252,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 4; + * optional bool has_taken_rewards = 13; * @return this */ public RogueArea clearHasTakenRewards() { @@ -262,7 +262,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 4; + * optional bool has_taken_rewards = 13; * @return the hasTakenRewards */ public boolean getHasTakenRewards() { @@ -270,7 +270,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 4; + * optional bool has_taken_rewards = 13; * @param value the hasTakenRewards to set * @return this */ @@ -287,9 +287,9 @@ public final class RogueAreaOuterClass { bitField0_ = other.bitField0_; rogueStatus = other.rogueStatus; areaId = other.areaId; - curReachRoomNum = other.curReachRoomNum; mapId = other.mapId; rogueAreaStatus = other.rogueAreaStatus; + curReachRoomNum = other.curReachRoomNum; hasTakenRewards = other.hasTakenRewards; } return this; @@ -307,15 +307,15 @@ public final class RogueAreaOuterClass { if (other.hasAreaId()) { setAreaId(other.areaId); } - if (other.hasCurReachRoomNum()) { - setCurReachRoomNum(other.curReachRoomNum); - } if (other.hasMapId()) { setMapId(other.mapId); } if (other.hasRogueAreaStatus()) { setRogueAreaStatus(other.rogueAreaStatus); } + if (other.hasCurReachRoomNum()) { + setCurReachRoomNum(other.curReachRoomNum); + } if (other.hasHasTakenRewards()) { setHasTakenRewards(other.hasTakenRewards); } @@ -331,9 +331,9 @@ public final class RogueAreaOuterClass { bitField0_ = 0; rogueStatus = 0; areaId = 0; - curReachRoomNum = 0; mapId = 0; rogueAreaStatus = 0; + curReachRoomNum = 0; hasTakenRewards = false; return this; } @@ -360,36 +360,36 @@ public final class RogueAreaOuterClass { return bitField0_ == other.bitField0_ && (!hasRogueStatus() || rogueStatus == other.rogueStatus) && (!hasAreaId() || areaId == other.areaId) - && (!hasCurReachRoomNum() || curReachRoomNum == other.curReachRoomNum) && (!hasMapId() || mapId == other.mapId) && (!hasRogueAreaStatus() || rogueAreaStatus == other.rogueAreaStatus) + && (!hasCurReachRoomNum() || curReachRoomNum == other.curReachRoomNum) && (!hasHasTakenRewards() || hasTakenRewards == other.hasTakenRewards); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(rogueStatus); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(mapId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(rogueAreaStatus); + } + if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(curReachRoomNum); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(mapId); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(rogueAreaStatus); - } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 104); output.writeBoolNoTag(hasTakenRewards); } } @@ -404,14 +404,14 @@ public final class RogueAreaOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueAreaStatus); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum); + } if ((bitField0_ & 0x00000020) != 0) { size += 2; } @@ -425,19 +425,37 @@ public final class RogueAreaOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // rogueStatus rogueStatus = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // areaId + areaId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // mapId + mapId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // areaId - areaId = input.readUInt32(); - bitField0_ |= 0x00000002; + // rogueAreaStatus + rogueAreaStatus = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 80) { break; @@ -446,31 +464,13 @@ public final class RogueAreaOuterClass { case 80: { // curReachRoomNum curReachRoomNum = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // mapId - mapId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // rogueAreaStatus - rogueAreaStatus = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { // hasTakenRewards hasTakenRewards = input.readBool(); bitField0_ |= 0x00000020; @@ -503,14 +503,14 @@ public final class RogueAreaOuterClass { output.writeUInt32(FieldNames.areaId, areaId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.mapId, mapId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.rogueAreaStatus, rogueAreaStatus); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum); + } if ((bitField0_ & 0x00000020) != 0) { output.writeBool(FieldNames.hasTakenRewards, hasTakenRewards); } @@ -548,24 +548,12 @@ 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 103663511: case -1081377058: { if (input.isAtField(FieldNames.mapId)) { if (!input.trySkipNullValue()) { mapId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -577,6 +565,18 @@ public final class RogueAreaOuterClass { if (input.isAtField(FieldNames.rogueAreaStatus)) { if (!input.trySkipNullValue()) { rogueAreaStatus = 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 areaId = FieldName.forField("areaId", "area_id"); - static final FieldName curReachRoomNum = FieldName.forField("curReachRoomNum", "cur_reach_room_num"); - static final FieldName mapId = FieldName.forField("mapId", "map_id"); static final FieldName rogueAreaStatus = FieldName.forField("rogueAreaStatus", "rogue_area_status"); + static final FieldName 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/RogueAreaStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAreaStatusOuterClass.java index c545b11..58bf4aa 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAreaStatusOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAreaStatusOuterClass.java @@ -77,7 +77,7 @@ public final class RogueAreaStatusOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return RogueAreaStatusConverter.INSTANCE; } @@ -99,7 +99,7 @@ public final class RogueAreaStatusOuterClass { return value == null ? other : value; } - enum RogueAreaStatusConverter implements EnumConverter { + enum RogueAreaStatusConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final RogueAreaStatus[] lookup = new RogueAreaStatus[4]; diff --git a/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java index 615f178..1f5b12c 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 = 9; + * repeated uint32 base_avatar_id_list = 2; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 9; + * repeated uint32 base_avatar_id_list = 2; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -43,7 +43,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 9; + * repeated uint32 base_avatar_id_list = 2; * @return this */ public RogueAvatarInfo clearBaseAvatarIdList() { @@ -53,7 +53,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 9; + * repeated uint32 base_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. @@ -67,7 +67,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 9; + * repeated uint32 base_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 @@ -81,7 +81,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 9; + * repeated uint32 base_avatar_id_list = 2; * @param value the baseAvatarIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 9; + * repeated uint32 base_avatar_id_list = 2; * @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) 72); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class RogueAvatarInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 18: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class RogueAvatarInfoOuterClass { tag = input.readTag(); break; } - case 72: { + case 16: { // baseAvatarIdList [packed=false] tag = input.readRepeatedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java index 6408b6b..22c5f81 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java @@ -19,12 +19,12 @@ public final class RogueBuffDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 3; + * optional uint32 level = 8; */ private int level; /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; */ private int buffId; @@ -39,7 +39,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 level = 3; + * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { @@ -47,7 +47,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 level = 3; + * optional uint32 level = 8; * @return this */ public RogueBuffData clearLevel() { @@ -57,7 +57,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 level = 3; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -65,7 +65,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 level = 3; + * optional uint32 level = 8; * @param value the level to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -84,7 +84,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; * @return this */ public RogueBuffData clearBuffId() { @@ -94,7 +94,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; * @return the buffId */ public int getBuffId() { @@ -102,7 +102,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; * @param value the buffId to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueBuffDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(buffId); } } @@ -205,16 +205,16 @@ public final class RogueBuffDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // level level = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 88) { break; } } - case 56: { + case 88: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java index 013256d..d12f3a6 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 = 3; + * optional float unk_float = 8; */ private float unkFloat; /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 5; */ private int buffId; /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 7; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -45,7 +45,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 3; + * optional float unk_float = 8; * @return whether the unkFloat field is set */ public boolean hasUnkFloat() { @@ -53,7 +53,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 3; + * optional float unk_float = 8; * @return this */ public RogueBuffEnhanceInfo clearUnkFloat() { @@ -63,7 +63,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 3; + * optional float unk_float = 8; * @return the unkFloat */ public float getUnkFloat() { @@ -71,7 +71,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 3; + * optional float unk_float = 8; * @param value the unkFloat to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 5; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -90,7 +90,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 5; * @return this */ public RogueBuffEnhanceInfo clearBuffId() { @@ -100,7 +100,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 5; * @return the buffId */ public int getBuffId() { @@ -108,7 +108,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 5; * @param value the buffId to set * @return this */ @@ -119,7 +119,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 7; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -127,7 +127,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 7; * @return this */ public RogueBuffEnhanceInfo clearItemCostList() { @@ -137,7 +137,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 7; * @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) 29); + output.writeRawByte((byte) 69); output.writeFloatNoTag(unkFloat); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 58); output.writeMessageNoTag(itemCostList); } } @@ -282,25 +282,25 @@ public final class RogueBuffEnhanceInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 29: { + case 69: { // unkFloat unkFloat = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 40) { break; } } - case 96: { + case 40: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 58) { break; } } - case 18: { + case 58: { // 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 249da54..cf27db9 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 = 7; + * repeated .RogueBuffEnhanceInfo buff_info = 1; */ private final RepeatedMessage buffInfo = RepeatedMessage.newEmptyInstance(RogueBuffEnhanceInfoOuterClass.RogueBuffEnhanceInfo.getFactory()); @@ -35,7 +35,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 7; + * repeated .RogueBuffEnhanceInfo buff_info = 1; * @return whether the buffInfo field is set */ public boolean hasBuffInfo() { @@ -43,7 +43,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 7; + * repeated .RogueBuffEnhanceInfo buff_info = 1; * @return this */ public RogueBuffEnhanceShopInfo clearBuffInfo() { @@ -53,7 +53,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 7; + * repeated .RogueBuffEnhanceInfo buff_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. @@ -67,7 +67,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 7; + * repeated .RogueBuffEnhanceInfo buff_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 @@ -82,7 +82,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 7; + * repeated .RogueBuffEnhanceInfo buff_info = 1; * @param value the buffInfo to add * @return this */ @@ -94,7 +94,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 7; + * repeated .RogueBuffEnhanceInfo buff_info = 1; * @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) 58); + output.writeRawByte((byte) 10); output.writeMessageNoTag(buffInfo.get(i)); } } @@ -188,7 +188,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 10: { // 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 b1700ab..7293fac 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 = 9; + * repeated .RogueBuff maze_buff_list = 8; */ private final RepeatedMessage mazeBuffList = RepeatedMessage.newEmptyInstance(RogueBuffOuterClass.RogueBuff.getFactory()); @@ -35,7 +35,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 9; + * repeated .RogueBuff maze_buff_list = 8; * @return whether the mazeBuffList field is set */ public boolean hasMazeBuffList() { @@ -43,7 +43,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 9; + * repeated .RogueBuff maze_buff_list = 8; * @return this */ public RogueBuffInfo clearMazeBuffList() { @@ -53,7 +53,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 9; + * repeated .RogueBuff maze_buff_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 9; + * repeated .RogueBuff maze_buff_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 9; + * repeated .RogueBuff maze_buff_list = 8; * @param value the mazeBuffList to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 9; + * repeated .RogueBuff maze_buff_list = 8; * @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) 74); + output.writeRawByte((byte) 66); output.writeMessageNoTag(mazeBuffList.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 66: { // 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 5c78c55..9e29303 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java @@ -18,16 +18,16 @@ public final class RogueBuffOuterClass { public static final class RogueBuff extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 level = 3; + */ + private int level; + /** * optional uint32 buff_id = 7; */ private int buffId; - /** - * optional uint32 level = 15; - */ - private int level; - private RogueBuff() { } @@ -38,12 +38,49 @@ public final class RogueBuffOuterClass { return new RogueBuff(); } + /** + * optional uint32 level = 3; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 level = 3; + * @return this + */ + public RogueBuff clearLevel() { + bitField0_ &= ~0x00000001; + 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 RogueBuff setLevel(final int value) { + bitField0_ |= 0x00000001; + level = value; + return this; + } + /** * optional uint32 buff_id = 7; * @return whether the buffId field is set */ public boolean hasBuffId() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -51,7 +88,7 @@ public final class RogueBuffOuterClass { * @return this */ public RogueBuff clearBuffId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; buffId = 0; return this; } @@ -70,45 +107,8 @@ public final class RogueBuffOuterClass { * @return this */ public RogueBuff setBuffId(final int value) { - bitField0_ |= 0x00000001; - buffId = value; - return this; - } - - /** - * optional uint32 level = 15; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 15; - * @return this - */ - public RogueBuff clearLevel() { - bitField0_ &= ~0x00000002; - level = 0; - return this; - } - - /** - * optional uint32 level = 15; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 15; - * @param value the level to set - * @return this - */ - public RogueBuff setLevel(final int value) { bitField0_ |= 0x00000002; - level = value; + buffId = value; return this; } @@ -117,8 +117,8 @@ public final class RogueBuffOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - buffId = other.buffId; level = other.level; + buffId = other.buffId; } return this; } @@ -129,12 +129,12 @@ public final class RogueBuffOuterClass { return this; } cachedSize = -1; - if (other.hasBuffId()) { - setBuffId(other.buffId); - } if (other.hasLevel()) { setLevel(other.level); } + if (other.hasBuffId()) { + setBuffId(other.buffId); + } return this; } @@ -145,8 +145,8 @@ public final class RogueBuffOuterClass { } cachedSize = -1; bitField0_ = 0; - buffId = 0; level = 0; + buffId = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueBuffOuterClass { } RogueBuff other = (RogueBuff) o; return bitField0_ == other.bitField0_ - && (!hasBuffId() || buffId == other.buffId) - && (!hasLevel() || level == other.level); + && (!hasLevel() || level == other.level) + && (!hasBuffId() || buffId == other.buffId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(buffId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(buffId); } } @@ -190,10 +190,10 @@ public final class RogueBuffOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } return size; } @@ -205,18 +205,18 @@ public final class RogueBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // buffId - buffId = input.readUInt32(); + case 24: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { - // level - level = input.readUInt32(); + case 56: { + // buffId + buffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RogueBuffOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.buffId, buffId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class RogueBuffOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1378119474: - case 227990663: { - if (input.isAtField(FieldNames.buffId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - buffId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class RogueBuffOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -1378119474: + case 227990663: { + if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + buffId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class RogueBuffOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); - static final FieldName level = FieldName.forField("level"); + + static final FieldName buffId = FieldName.forField("buffId", "buff_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffSourceOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffSourceOuterClass.java index 3127e4b..9b1e15f 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffSourceOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffSourceOuterClass.java @@ -137,7 +137,7 @@ public final class RogueBuffSourceOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return RogueBuffSourceConverter.INSTANCE; } @@ -159,7 +159,7 @@ public final class RogueBuffSourceOuterClass { return value == null ? other : value; } - enum RogueBuffSourceConverter implements EnumConverter { + enum RogueBuffSourceConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final RogueBuffSource[] lookup = new RogueBuffSource[10]; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonActionResultDisplayTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonActionResultDisplayTypeOuterClass.java index 08deb89..15d3664 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonActionResultDisplayTypeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonActionResultDisplayTypeOuterClass.java @@ -67,7 +67,7 @@ public final class RogueCommonActionResultDisplayTypeOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return RogueCommonActionResultDisplayTypeConverter.INSTANCE; } @@ -90,7 +90,7 @@ public final class RogueCommonActionResultDisplayTypeOuterClass { return value == null ? other : value; } - enum RogueCommonActionResultDisplayTypeConverter implements EnumConverter { + enum RogueCommonActionResultDisplayTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final RogueCommonActionResultDisplayType[] lookup = new RogueCommonActionResultDisplayType[3]; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java index 2fc81fb..a412fd7 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java @@ -19,12 +19,12 @@ public final class RogueCommonBuffOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_level = 3; + * optional uint32 buff_level = 8; */ private int buffLevel; /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; */ private int buffId; @@ -39,7 +39,7 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_level = 3; + * optional uint32 buff_level = 8; * @return whether the buffLevel field is set */ public boolean hasBuffLevel() { @@ -47,7 +47,7 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_level = 3; + * optional uint32 buff_level = 8; * @return this */ public RogueCommonBuff clearBuffLevel() { @@ -57,7 +57,7 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_level = 3; + * optional uint32 buff_level = 8; * @return the buffLevel */ public int getBuffLevel() { @@ -65,7 +65,7 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_level = 3; + * optional uint32 buff_level = 8; * @param value the buffLevel to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -84,7 +84,7 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; * @return this */ public RogueCommonBuff clearBuffId() { @@ -94,7 +94,7 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; * @return the buffId */ public int getBuffId() { @@ -102,7 +102,7 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 11; * @param value the buffId to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueCommonBuffOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(buffLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(buffId); } } @@ -205,16 +205,16 @@ public final class RogueCommonBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // buffLevel buffLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 88) { break; } } - case 56: { + case 88: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java index b6fab7f..9cf8cc6 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java @@ -21,24 +21,14 @@ public final class RogueCommonBuffSelectInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 roll_buff_max_times = 1; - */ - private int rollBuffMaxTimes; - - /** - * optional uint32 source_cur_count = 2; + * optional uint32 source_cur_count = 4; */ private int sourceCurCount; /** - * optional uint32 source_total_count = 3; + * optional uint32 roll_buff_max_times = 6; */ - private int sourceTotalCount; - - /** - * optional uint32 roll_buff_times = 6; - */ - private int rollBuffTimes; + private int rollBuffMaxTimes; /** * optional uint32 roll_buff_free_count = 9; @@ -46,42 +36,52 @@ public final class RogueCommonBuffSelectInfoOuterClass { private int rollBuffFreeCount; /** - * optional uint32 certain_select_buff_id = 14; - */ - private int certainSelectBuffId; - - /** - * optional uint32 select_buff_source_hint = 15; + * optional uint32 select_buff_source_hint = 11; */ private int selectBuffSourceHint; /** - * optional .RogueCommonBuffSelectSource source_type = 4; + * optional uint32 roll_buff_times = 12; + */ + private int rollBuffTimes; + + /** + * optional uint32 certain_select_buff_id = 13; + */ + private int certainSelectBuffId; + + /** + * optional uint32 source_total_count = 15; + */ + private int sourceTotalCount; + + /** + * optional .RogueCommonBuffSelectSource source_type = 8; */ private int sourceType; /** - * optional bool can_roll = 7; + * optional bool can_roll = 1; */ private boolean canRoll; /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 5; */ private final ItemCostListOuterClass.ItemCostList rollBuffsCost = ItemCostListOuterClass.ItemCostList.newInstance(); /** - * repeated uint32 first_buff_type_list = 8; + * repeated uint32 first_buff_type_list = 2; */ private final RepeatedInt firstBuffTypeList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 handbook_unlock_buff_id_list = 13; + * repeated uint32 handbook_unlock_buff_id_list = 3; */ private final RepeatedInt handbookUnlockBuffIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .RogueCommonBuff maze_buff_list = 10; + * repeated .RogueCommonBuff maze_buff_list = 7; */ private final RepeatedMessage mazeBuffList = RepeatedMessage.newEmptyInstance(RogueCommonBuffOuterClass.RogueCommonBuff.getFactory()); @@ -96,62 +96,25 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_max_times = 1; - * @return whether the rollBuffMaxTimes field is set + * optional uint32 source_cur_count = 4; + * @return whether the sourceCurCount field is set */ - public boolean hasRollBuffMaxTimes() { + public boolean hasSourceCurCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 roll_buff_max_times = 1; - * @return this - */ - public RogueCommonBuffSelectInfo clearRollBuffMaxTimes() { - bitField0_ &= ~0x00000001; - rollBuffMaxTimes = 0; - return this; - } - - /** - * optional uint32 roll_buff_max_times = 1; - * @return the rollBuffMaxTimes - */ - public int getRollBuffMaxTimes() { - return rollBuffMaxTimes; - } - - /** - * optional uint32 roll_buff_max_times = 1; - * @param value the rollBuffMaxTimes to set - * @return this - */ - public RogueCommonBuffSelectInfo setRollBuffMaxTimes(final int value) { - bitField0_ |= 0x00000001; - rollBuffMaxTimes = value; - return this; - } - - /** - * optional uint32 source_cur_count = 2; - * @return whether the sourceCurCount field is set - */ - public boolean hasSourceCurCount() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 source_cur_count = 2; + * optional uint32 source_cur_count = 4; * @return this */ public RogueCommonBuffSelectInfo clearSourceCurCount() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; sourceCurCount = 0; return this; } /** - * optional uint32 source_cur_count = 2; + * optional uint32 source_cur_count = 4; * @return the sourceCurCount */ public int getSourceCurCount() { @@ -159,87 +122,50 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 source_cur_count = 2; + * optional uint32 source_cur_count = 4; * @param value the sourceCurCount to set * @return this */ public RogueCommonBuffSelectInfo setSourceCurCount(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; sourceCurCount = value; return this; } /** - * optional uint32 source_total_count = 3; - * @return whether the sourceTotalCount field is set + * optional uint32 roll_buff_max_times = 6; + * @return whether the rollBuffMaxTimes field is set */ - public boolean hasSourceTotalCount() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasRollBuffMaxTimes() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 source_total_count = 3; + * optional uint32 roll_buff_max_times = 6; * @return this */ - public RogueCommonBuffSelectInfo clearSourceTotalCount() { - bitField0_ &= ~0x00000004; - sourceTotalCount = 0; + public RogueCommonBuffSelectInfo clearRollBuffMaxTimes() { + bitField0_ &= ~0x00000002; + rollBuffMaxTimes = 0; return this; } /** - * optional uint32 source_total_count = 3; - * @return the sourceTotalCount + * optional uint32 roll_buff_max_times = 6; + * @return the rollBuffMaxTimes */ - public int getSourceTotalCount() { - return sourceTotalCount; + public int getRollBuffMaxTimes() { + return rollBuffMaxTimes; } /** - * optional uint32 source_total_count = 3; - * @param value the sourceTotalCount to set + * optional uint32 roll_buff_max_times = 6; + * @param value the rollBuffMaxTimes to set * @return this */ - public RogueCommonBuffSelectInfo setSourceTotalCount(final int value) { - bitField0_ |= 0x00000004; - sourceTotalCount = value; - return this; - } - - /** - * optional uint32 roll_buff_times = 6; - * @return whether the rollBuffTimes field is set - */ - public boolean hasRollBuffTimes() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 roll_buff_times = 6; - * @return this - */ - public RogueCommonBuffSelectInfo clearRollBuffTimes() { - bitField0_ &= ~0x00000008; - rollBuffTimes = 0; - return this; - } - - /** - * optional uint32 roll_buff_times = 6; - * @return the rollBuffTimes - */ - public int getRollBuffTimes() { - return rollBuffTimes; - } - - /** - * optional uint32 roll_buff_times = 6; - * @param value the rollBuffTimes to set - * @return this - */ - public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) { - bitField0_ |= 0x00000008; - rollBuffTimes = value; + public RogueCommonBuffSelectInfo setRollBuffMaxTimes(final int value) { + bitField0_ |= 0x00000002; + rollBuffMaxTimes = value; return this; } @@ -248,7 +174,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return whether the rollBuffFreeCount field is set */ public boolean hasRollBuffFreeCount() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -256,7 +182,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return this */ public RogueCommonBuffSelectInfo clearRollBuffFreeCount() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; rollBuffFreeCount = 0; return this; } @@ -275,13 +201,87 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return this */ public RogueCommonBuffSelectInfo setRollBuffFreeCount(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; rollBuffFreeCount = value; return this; } /** - * optional uint32 certain_select_buff_id = 14; + * optional uint32 select_buff_source_hint = 11; + * @return whether the selectBuffSourceHint field is set + */ + public boolean hasSelectBuffSourceHint() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 select_buff_source_hint = 11; + * @return this + */ + public RogueCommonBuffSelectInfo clearSelectBuffSourceHint() { + bitField0_ &= ~0x00000008; + selectBuffSourceHint = 0; + return this; + } + + /** + * optional uint32 select_buff_source_hint = 11; + * @return the selectBuffSourceHint + */ + public int getSelectBuffSourceHint() { + return selectBuffSourceHint; + } + + /** + * optional uint32 select_buff_source_hint = 11; + * @param value the selectBuffSourceHint to set + * @return this + */ + public RogueCommonBuffSelectInfo setSelectBuffSourceHint(final int value) { + bitField0_ |= 0x00000008; + selectBuffSourceHint = value; + return this; + } + + /** + * optional uint32 roll_buff_times = 12; + * @return whether the rollBuffTimes field is set + */ + public boolean hasRollBuffTimes() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 roll_buff_times = 12; + * @return this + */ + public RogueCommonBuffSelectInfo clearRollBuffTimes() { + bitField0_ &= ~0x00000010; + rollBuffTimes = 0; + return this; + } + + /** + * optional uint32 roll_buff_times = 12; + * @return the rollBuffTimes + */ + public int getRollBuffTimes() { + return rollBuffTimes; + } + + /** + * optional uint32 roll_buff_times = 12; + * @param value the rollBuffTimes to set + * @return this + */ + public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) { + bitField0_ |= 0x00000010; + rollBuffTimes = value; + return this; + } + + /** + * optional uint32 certain_select_buff_id = 13; * @return whether the certainSelectBuffId field is set */ public boolean hasCertainSelectBuffId() { @@ -289,7 +289,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 certain_select_buff_id = 14; + * optional uint32 certain_select_buff_id = 13; * @return this */ public RogueCommonBuffSelectInfo clearCertainSelectBuffId() { @@ -299,7 +299,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 certain_select_buff_id = 14; + * optional uint32 certain_select_buff_id = 13; * @return the certainSelectBuffId */ public int getCertainSelectBuffId() { @@ -307,7 +307,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 certain_select_buff_id = 14; + * optional uint32 certain_select_buff_id = 13; * @param value the certainSelectBuffId to set * @return this */ @@ -318,44 +318,44 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 select_buff_source_hint = 15; - * @return whether the selectBuffSourceHint field is set + * optional uint32 source_total_count = 15; + * @return whether the sourceTotalCount field is set */ - public boolean hasSelectBuffSourceHint() { + public boolean hasSourceTotalCount() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 select_buff_source_hint = 15; + * optional uint32 source_total_count = 15; * @return this */ - public RogueCommonBuffSelectInfo clearSelectBuffSourceHint() { + public RogueCommonBuffSelectInfo clearSourceTotalCount() { bitField0_ &= ~0x00000040; - selectBuffSourceHint = 0; + sourceTotalCount = 0; return this; } /** - * optional uint32 select_buff_source_hint = 15; - * @return the selectBuffSourceHint + * optional uint32 source_total_count = 15; + * @return the sourceTotalCount */ - public int getSelectBuffSourceHint() { - return selectBuffSourceHint; + public int getSourceTotalCount() { + return sourceTotalCount; } /** - * optional uint32 select_buff_source_hint = 15; - * @param value the selectBuffSourceHint to set + * optional uint32 source_total_count = 15; + * @param value the sourceTotalCount to set * @return this */ - public RogueCommonBuffSelectInfo setSelectBuffSourceHint(final int value) { + public RogueCommonBuffSelectInfo setSourceTotalCount(final int value) { bitField0_ |= 0x00000040; - selectBuffSourceHint = value; + sourceTotalCount = value; return this; } /** - * optional .RogueCommonBuffSelectSource source_type = 4; + * optional .RogueCommonBuffSelectSource source_type = 8; * @return whether the sourceType field is set */ public boolean hasSourceType() { @@ -363,7 +363,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 4; + * optional .RogueCommonBuffSelectSource source_type = 8; * @return this */ public RogueCommonBuffSelectInfo clearSourceType() { @@ -373,7 +373,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 4; + * optional .RogueCommonBuffSelectSource source_type = 8; * @return the sourceType */ public RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource getSourceType() { @@ -406,7 +406,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 4; + * optional .RogueCommonBuffSelectSource source_type = 8; * @param value the sourceType to set * @return this */ @@ -418,7 +418,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 7; + * optional bool can_roll = 1; * @return whether the canRoll field is set */ public boolean hasCanRoll() { @@ -426,7 +426,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 7; + * optional bool can_roll = 1; * @return this */ public RogueCommonBuffSelectInfo clearCanRoll() { @@ -436,7 +436,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 7; + * optional bool can_roll = 1; * @return the canRoll */ public boolean getCanRoll() { @@ -444,7 +444,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 7; + * optional bool can_roll = 1; * @param value the canRoll to set * @return this */ @@ -455,7 +455,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 5; * @return whether the rollBuffsCost field is set */ public boolean hasRollBuffsCost() { @@ -463,7 +463,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 5; * @return this */ public RogueCommonBuffSelectInfo clearRollBuffsCost() { @@ -473,7 +473,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 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. @@ -487,7 +487,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 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 @@ -501,7 +501,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 5; * @param value the rollBuffsCost to set * @return this */ @@ -513,7 +513,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 8; + * repeated uint32 first_buff_type_list = 2; * @return whether the firstBuffTypeList field is set */ public boolean hasFirstBuffTypeList() { @@ -521,7 +521,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 8; + * repeated uint32 first_buff_type_list = 2; * @return this */ public RogueCommonBuffSelectInfo clearFirstBuffTypeList() { @@ -531,7 +531,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 8; + * repeated uint32 first_buff_type_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. @@ -545,7 +545,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 8; + * repeated uint32 first_buff_type_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 @@ -559,7 +559,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 8; + * repeated uint32 first_buff_type_list = 2; * @param value the firstBuffTypeList to add * @return this */ @@ -570,7 +570,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 8; + * repeated uint32 first_buff_type_list = 2; * @param values the firstBuffTypeList to add * @return this */ @@ -581,7 +581,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 13; + * repeated uint32 handbook_unlock_buff_id_list = 3; * @return whether the handbookUnlockBuffIdList field is set */ public boolean hasHandbookUnlockBuffIdList() { @@ -589,7 +589,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 13; + * repeated uint32 handbook_unlock_buff_id_list = 3; * @return this */ public RogueCommonBuffSelectInfo clearHandbookUnlockBuffIdList() { @@ -599,7 +599,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 13; + * repeated uint32 handbook_unlock_buff_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. @@ -613,7 +613,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 13; + * repeated uint32 handbook_unlock_buff_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 @@ -627,7 +627,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 13; + * repeated uint32 handbook_unlock_buff_id_list = 3; * @param value the handbookUnlockBuffIdList to add * @return this */ @@ -638,7 +638,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 13; + * repeated uint32 handbook_unlock_buff_id_list = 3; * @param values the handbookUnlockBuffIdList to add * @return this */ @@ -649,7 +649,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 10; + * repeated .RogueCommonBuff maze_buff_list = 7; * @return whether the mazeBuffList field is set */ public boolean hasMazeBuffList() { @@ -657,7 +657,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 10; + * repeated .RogueCommonBuff maze_buff_list = 7; * @return this */ public RogueCommonBuffSelectInfo clearMazeBuffList() { @@ -667,7 +667,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 10; + * repeated .RogueCommonBuff maze_buff_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. @@ -681,7 +681,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 10; + * repeated .RogueCommonBuff maze_buff_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 @@ -695,7 +695,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 10; + * repeated .RogueCommonBuff maze_buff_list = 7; * @param value the mazeBuffList to add * @return this */ @@ -707,7 +707,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 10; + * repeated .RogueCommonBuff maze_buff_list = 7; * @param values the mazeBuffList to add * @return this */ @@ -723,13 +723,13 @@ public final class RogueCommonBuffSelectInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rollBuffMaxTimes = other.rollBuffMaxTimes; sourceCurCount = other.sourceCurCount; - sourceTotalCount = other.sourceTotalCount; - rollBuffTimes = other.rollBuffTimes; + rollBuffMaxTimes = other.rollBuffMaxTimes; rollBuffFreeCount = other.rollBuffFreeCount; - certainSelectBuffId = other.certainSelectBuffId; selectBuffSourceHint = other.selectBuffSourceHint; + rollBuffTimes = other.rollBuffTimes; + certainSelectBuffId = other.certainSelectBuffId; + sourceTotalCount = other.sourceTotalCount; sourceType = other.sourceType; canRoll = other.canRoll; rollBuffsCost.copyFrom(other.rollBuffsCost); @@ -746,26 +746,26 @@ public final class RogueCommonBuffSelectInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRollBuffMaxTimes()) { - setRollBuffMaxTimes(other.rollBuffMaxTimes); - } if (other.hasSourceCurCount()) { setSourceCurCount(other.sourceCurCount); } - if (other.hasSourceTotalCount()) { - setSourceTotalCount(other.sourceTotalCount); - } - if (other.hasRollBuffTimes()) { - setRollBuffTimes(other.rollBuffTimes); + if (other.hasRollBuffMaxTimes()) { + setRollBuffMaxTimes(other.rollBuffMaxTimes); } if (other.hasRollBuffFreeCount()) { setRollBuffFreeCount(other.rollBuffFreeCount); } + if (other.hasSelectBuffSourceHint()) { + setSelectBuffSourceHint(other.selectBuffSourceHint); + } + if (other.hasRollBuffTimes()) { + setRollBuffTimes(other.rollBuffTimes); + } if (other.hasCertainSelectBuffId()) { setCertainSelectBuffId(other.certainSelectBuffId); } - if (other.hasSelectBuffSourceHint()) { - setSelectBuffSourceHint(other.selectBuffSourceHint); + if (other.hasSourceTotalCount()) { + setSourceTotalCount(other.sourceTotalCount); } if (other.hasSourceType()) { setSourceTypeValue(other.sourceType); @@ -795,13 +795,13 @@ public final class RogueCommonBuffSelectInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rollBuffMaxTimes = 0; sourceCurCount = 0; - sourceTotalCount = 0; - rollBuffTimes = 0; + rollBuffMaxTimes = 0; rollBuffFreeCount = 0; - certainSelectBuffId = 0; selectBuffSourceHint = 0; + rollBuffTimes = 0; + certainSelectBuffId = 0; + sourceTotalCount = 0; sourceType = 0; canRoll = false; rollBuffsCost.clear(); @@ -835,13 +835,13 @@ public final class RogueCommonBuffSelectInfoOuterClass { } RogueCommonBuffSelectInfo other = (RogueCommonBuffSelectInfo) o; return bitField0_ == other.bitField0_ - && (!hasRollBuffMaxTimes() || rollBuffMaxTimes == other.rollBuffMaxTimes) && (!hasSourceCurCount() || sourceCurCount == other.sourceCurCount) - && (!hasSourceTotalCount() || sourceTotalCount == other.sourceTotalCount) - && (!hasRollBuffTimes() || rollBuffTimes == other.rollBuffTimes) + && (!hasRollBuffMaxTimes() || rollBuffMaxTimes == other.rollBuffMaxTimes) && (!hasRollBuffFreeCount() || rollBuffFreeCount == other.rollBuffFreeCount) - && (!hasCertainSelectBuffId() || certainSelectBuffId == other.certainSelectBuffId) && (!hasSelectBuffSourceHint() || selectBuffSourceHint == other.selectBuffSourceHint) + && (!hasRollBuffTimes() || rollBuffTimes == other.rollBuffTimes) + && (!hasCertainSelectBuffId() || certainSelectBuffId == other.certainSelectBuffId) + && (!hasSourceTotalCount() || sourceTotalCount == other.sourceTotalCount) && (!hasSourceType() || sourceType == other.sourceType) && (!hasCanRoll() || canRoll == other.canRoll) && (!hasRollBuffsCost() || rollBuffsCost.equals(other.rollBuffsCost)) @@ -853,60 +853,60 @@ public final class RogueCommonBuffSelectInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(rollBuffMaxTimes); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(sourceCurCount); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(sourceTotalCount); - } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(rollBuffTimes); + output.writeUInt32NoTag(rollBuffMaxTimes); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 72); output.writeUInt32NoTag(rollBuffFreeCount); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(selectBuffSourceHint); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(rollBuffTimes); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(certainSelectBuffId); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(selectBuffSourceHint); + output.writeUInt32NoTag(sourceTotalCount); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 64); output.writeEnumNoTag(sourceType); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 8); output.writeBoolNoTag(canRoll); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(rollBuffsCost); } if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < firstBuffTypeList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(firstBuffTypeList.array()[i]); } } if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < handbookUnlockBuffIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(handbookUnlockBuffIdList.array()[i]); } } if ((bitField0_ & 0x00001000) != 0) { for (int i = 0; i < mazeBuffList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 58); output.writeMessageNoTag(mazeBuffList.get(i)); } } @@ -916,25 +916,25 @@ 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(sourceCurCount); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffMaxTimes); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceTotalCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffFreeCount); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffFreeCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(certainSelectBuffId); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint); + size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceTotalCount); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(sourceType); @@ -964,37 +964,19 @@ public final class RogueCommonBuffSelectInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // rollBuffMaxTimes - rollBuffMaxTimes = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { + case 32: { // sourceCurCount sourceCurCount = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // sourceTotalCount - sourceTotalCount = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 48) { break; } } case 48: { - // rollBuffTimes - rollBuffTimes = input.readUInt32(); - bitField0_ |= 0x00000008; + // rollBuffMaxTimes + rollBuffMaxTimes = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 72) { break; @@ -1003,13 +985,31 @@ public final class RogueCommonBuffSelectInfoOuterClass { case 72: { // rollBuffFreeCount rollBuffFreeCount = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { + // selectBuffSourceHint + selectBuffSourceHint = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // rollBuffTimes + rollBuffTimes = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // certainSelectBuffId certainSelectBuffId = input.readUInt32(); bitField0_ |= 0x00000020; @@ -1019,15 +1019,15 @@ public final class RogueCommonBuffSelectInfoOuterClass { } } case 120: { - // selectBuffSourceHint - selectBuffSourceHint = input.readUInt32(); + // sourceTotalCount + sourceTotalCount = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 32) { + if (tag != 64) { break; } } - case 32: { + case 64: { // sourceType final int value = input.readInt32(); if (RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.forNumber(value) != null) { @@ -1035,47 +1035,47 @@ public final class RogueCommonBuffSelectInfoOuterClass { bitField0_ |= 0x00000080; } tag = input.readTag(); - if (tag != 56) { + if (tag != 8) { break; } } - case 56: { + case 8: { // canRoll canRoll = input.readBool(); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 98) { + if (tag != 42) { break; } } - case 98: { + case 42: { // rollBuffsCost input.readMessage(rollBuffsCost); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 66) { + if (tag != 18) { break; } } - case 66: { + case 18: { // firstBuffTypeList [packed=true] input.readPackedUInt32(firstBuffTypeList, tag); bitField0_ |= 0x00000400; tag = input.readTag(); - if (tag != 106) { + if (tag != 26) { break; } } - case 106: { + case 26: { // handbookUnlockBuffIdList [packed=true] input.readPackedUInt32(handbookUnlockBuffIdList, tag); bitField0_ |= 0x00000800; tag = input.readTag(); - if (tag != 82) { + if (tag != 58) { break; } } - case 82: { + case 58: { // mazeBuffList tag = input.readRepeatedMessage(mazeBuffList, tag); bitField0_ |= 0x00001000; @@ -1093,13 +1093,13 @@ public final class RogueCommonBuffSelectInfoOuterClass { tag = input.readTag(); break; } - case 64: { + case 16: { // firstBuffTypeList [packed=false] tag = input.readRepeatedUInt32(firstBuffTypeList, tag); bitField0_ |= 0x00000400; break; } - case 104: { + case 24: { // handbookUnlockBuffIdList [packed=false] tag = input.readRepeatedUInt32(handbookUnlockBuffIdList, tag); bitField0_ |= 0x00000800; @@ -1113,25 +1113,25 @@ 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.sourceCurCount, sourceCurCount); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.rollBuffMaxTimes, rollBuffMaxTimes); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.sourceTotalCount, sourceTotalCount); + output.writeUInt32(FieldNames.rollBuffFreeCount, rollBuffFreeCount); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes); + output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.rollBuffFreeCount, rollBuffFreeCount); + output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes); } if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.certainSelectBuffId, certainSelectBuffId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint); + output.writeUInt32(FieldNames.sourceTotalCount, sourceTotalCount); } if ((bitField0_ & 0x00000080) != 0) { output.writeEnum(FieldNames.sourceType, sourceType, RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.converter()); @@ -1161,11 +1161,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -564731182: - case -792528959: { - if (input.isAtField(FieldNames.rollBuffMaxTimes)) { + case -831207446: + case 557368108: { + if (input.isAtField(FieldNames.sourceCurCount)) { if (!input.trySkipNullValue()) { - rollBuffMaxTimes = input.readUInt32(); + sourceCurCount = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1173,11 +1173,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -831207446: - case 557368108: { - if (input.isAtField(FieldNames.sourceCurCount)) { + case -564731182: + case -792528959: { + if (input.isAtField(FieldNames.rollBuffMaxTimes)) { if (!input.trySkipNullValue()) { - sourceCurCount = input.readUInt32(); + rollBuffMaxTimes = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1185,35 +1185,35 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -1098445146: - case -1750826448: { - if (input.isAtField(FieldNames.sourceTotalCount)) { - if (!input.trySkipNullValue()) { - sourceTotalCount = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -436216138: - case 2038334812: { - if (input.isAtField(FieldNames.rollBuffTimes)) { - if (!input.trySkipNullValue()) { - rollBuffTimes = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -227537549: case -710203098: { if (input.isAtField(FieldNames.rollBuffFreeCount)) { if (!input.trySkipNullValue()) { rollBuffFreeCount = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1160450543: + case -335538398: { + if (input.isAtField(FieldNames.selectBuffSourceHint)) { + if (!input.trySkipNullValue()) { + selectBuffSourceHint = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -436216138: + case 2038334812: { + if (input.isAtField(FieldNames.rollBuffTimes)) { + if (!input.trySkipNullValue()) { + rollBuffTimes = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1233,11 +1233,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_ |= 0x00000040; } } else { @@ -1375,19 +1375,19 @@ 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 sourceCurCount = FieldName.forField("sourceCurCount", "source_cur_count"); - static final FieldName sourceTotalCount = FieldName.forField("sourceTotalCount", "source_total_count"); - - static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times"); + static final FieldName rollBuffMaxTimes = FieldName.forField("rollBuffMaxTimes", "roll_buff_max_times"); static final FieldName rollBuffFreeCount = FieldName.forField("rollBuffFreeCount", "roll_buff_free_count"); + static final FieldName selectBuffSourceHint = FieldName.forField("selectBuffSourceHint", "select_buff_source_hint"); + + static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times"); + static final FieldName certainSelectBuffId = FieldName.forField("certainSelectBuffId", "certain_select_buff_id"); - static final FieldName selectBuffSourceHint = FieldName.forField("selectBuffSourceHint", "select_buff_source_hint"); + static final FieldName sourceTotalCount = FieldName.forField("sourceTotalCount", "source_total_count"); static final FieldName sourceType = FieldName.forField("sourceType", "source_type"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectSourceOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectSourceOuterClass.java index 2de10ea..ed117d8 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectSourceOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectSourceOuterClass.java @@ -87,7 +87,7 @@ public final class RogueCommonBuffSelectSourceOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return RogueCommonBuffSelectSourceConverter.INSTANCE; } @@ -110,7 +110,7 @@ public final class RogueCommonBuffSelectSourceOuterClass { return value == null ? other : value; } - enum RogueCommonBuffSelectSourceConverter implements EnumConverter { + enum RogueCommonBuffSelectSourceConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final RogueCommonBuffSelectSource[] lookup = new RogueCommonBuffSelectSource[5]; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueBasicInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueBasicInfoOuterClass.java index 766ec3c..9fb84ea 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueBasicInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueBasicInfoOuterClass.java @@ -19,14 +19,14 @@ public final class RogueCommonDialogueBasicInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 dialogue_id = 4; + * optional uint32 dialogue_id = 5; */ private int dialogueId; /** - * optional uint32 sus = 5; + * optional uint32 rogue_npc_id = 7; */ - private int sus; + private int rogueNpcId; private RogueCommonDialogueBasicInfo() { } @@ -39,7 +39,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { } /** - * optional uint32 dialogue_id = 4; + * optional uint32 dialogue_id = 5; * @return whether the dialogueId field is set */ public boolean hasDialogueId() { @@ -47,7 +47,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { } /** - * optional uint32 dialogue_id = 4; + * optional uint32 dialogue_id = 5; * @return this */ public RogueCommonDialogueBasicInfo clearDialogueId() { @@ -57,7 +57,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { } /** - * optional uint32 dialogue_id = 4; + * optional uint32 dialogue_id = 5; * @return the dialogueId */ public int getDialogueId() { @@ -65,7 +65,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { } /** - * optional uint32 dialogue_id = 4; + * optional uint32 dialogue_id = 5; * @param value the dialogueId to set * @return this */ @@ -76,39 +76,39 @@ public final class RogueCommonDialogueBasicInfoOuterClass { } /** - * optional uint32 sus = 5; - * @return whether the sus field is set + * optional uint32 rogue_npc_id = 7; + * @return whether the rogueNpcId field is set */ - public boolean hasSus() { + public boolean hasRogueNpcId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 sus = 5; + * optional uint32 rogue_npc_id = 7; * @return this */ - public RogueCommonDialogueBasicInfo clearSus() { + public RogueCommonDialogueBasicInfo clearRogueNpcId() { bitField0_ &= ~0x00000002; - sus = 0; + rogueNpcId = 0; return this; } /** - * optional uint32 sus = 5; - * @return the sus + * optional uint32 rogue_npc_id = 7; + * @return the rogueNpcId */ - public int getSus() { - return sus; + public int getRogueNpcId() { + return rogueNpcId; } /** - * optional uint32 sus = 5; - * @param value the sus to set + * optional uint32 rogue_npc_id = 7; + * @param value the rogueNpcId to set * @return this */ - public RogueCommonDialogueBasicInfo setSus(final int value) { + public RogueCommonDialogueBasicInfo setRogueNpcId(final int value) { bitField0_ |= 0x00000002; - sus = value; + rogueNpcId = value; return this; } @@ -118,7 +118,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; dialogueId = other.dialogueId; - sus = other.sus; + rogueNpcId = other.rogueNpcId; } return this; } @@ -132,8 +132,8 @@ public final class RogueCommonDialogueBasicInfoOuterClass { if (other.hasDialogueId()) { setDialogueId(other.dialogueId); } - if (other.hasSus()) { - setSus(other.sus); + if (other.hasRogueNpcId()) { + setRogueNpcId(other.rogueNpcId); } return this; } @@ -146,7 +146,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { cachedSize = -1; bitField0_ = 0; dialogueId = 0; - sus = 0; + rogueNpcId = 0; return this; } @@ -171,18 +171,18 @@ public final class RogueCommonDialogueBasicInfoOuterClass { RogueCommonDialogueBasicInfo other = (RogueCommonDialogueBasicInfo) o; return bitField0_ == other.bitField0_ && (!hasDialogueId() || dialogueId == other.dialogueId) - && (!hasSus() || sus == other.sus); + && (!hasRogueNpcId() || rogueNpcId == other.rogueNpcId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(dialogueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(sus); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(rogueNpcId); } } @@ -193,7 +193,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(sus); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueNpcId); } return size; } @@ -205,18 +205,18 @@ public final class RogueCommonDialogueBasicInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // dialogueId dialogueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { - // sus - sus = input.readUInt32(); + case 56: { + // rogueNpcId + rogueNpcId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -244,7 +244,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { output.writeUInt32(FieldNames.dialogueId, dialogueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.sus, sus); + output.writeUInt32(FieldNames.rogueNpcId, rogueNpcId); } output.endObject(); } @@ -268,10 +268,11 @@ public final class RogueCommonDialogueBasicInfoOuterClass { } break; } - case 114257: { - if (input.isAtField(FieldNames.sus)) { + case -1140086238: + case 1751967038: { + if (input.isAtField(FieldNames.rogueNpcId)) { if (!input.trySkipNullValue()) { - sus = input.readUInt32(); + rogueNpcId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -336,7 +337,7 @@ public final class RogueCommonDialogueBasicInfoOuterClass { static class FieldNames { static final FieldName dialogueId = FieldName.forField("dialogueId", "dialogue_id"); - static final FieldName sus = FieldName.forField("sus"); + static final FieldName rogueNpcId = FieldName.forField("rogueNpcId", "rogue_npc_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueDataInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueDataInfoOuterClass.java index 6a261d7..bade774 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueDataInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueDataInfoOuterClass.java @@ -20,17 +20,17 @@ public final class RogueCommonDialogueDataInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_unique_id = 15; + * optional uint32 event_unique_id = 8; */ private int eventUniqueId; /** - * optional .RogueCommonDialogueInfo dialogue_info = 4; + * optional .RogueCommonDialogueInfo dialogue_info = 1; */ private final RogueCommonDialogueInfoOuterClass.RogueCommonDialogueInfo dialogueInfo = RogueCommonDialogueInfoOuterClass.RogueCommonDialogueInfo.newInstance(); /** - * repeated .RogueCommonDialogueOptionInfo option_list = 1; + * repeated .RogueCommonDialogueOptionInfo option_list = 2; */ private final RepeatedMessage optionList = RepeatedMessage.newEmptyInstance(RogueCommonDialogueOptionInfoOuterClass.RogueCommonDialogueOptionInfo.getFactory()); @@ -45,7 +45,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional uint32 event_unique_id = 15; + * optional uint32 event_unique_id = 8; * @return whether the eventUniqueId field is set */ public boolean hasEventUniqueId() { @@ -53,7 +53,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional uint32 event_unique_id = 15; + * optional uint32 event_unique_id = 8; * @return this */ public RogueCommonDialogueDataInfo clearEventUniqueId() { @@ -63,7 +63,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional uint32 event_unique_id = 15; + * optional uint32 event_unique_id = 8; * @return the eventUniqueId */ public int getEventUniqueId() { @@ -71,7 +71,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional uint32 event_unique_id = 15; + * optional uint32 event_unique_id = 8; * @param value the eventUniqueId to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional .RogueCommonDialogueInfo dialogue_info = 4; + * optional .RogueCommonDialogueInfo dialogue_info = 1; * @return whether the dialogueInfo field is set */ public boolean hasDialogueInfo() { @@ -90,7 +90,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional .RogueCommonDialogueInfo dialogue_info = 4; + * optional .RogueCommonDialogueInfo dialogue_info = 1; * @return this */ public RogueCommonDialogueDataInfo clearDialogueInfo() { @@ -100,7 +100,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional .RogueCommonDialogueInfo dialogue_info = 4; + * optional .RogueCommonDialogueInfo dialogue_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. @@ -114,7 +114,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional .RogueCommonDialogueInfo dialogue_info = 4; + * optional .RogueCommonDialogueInfo dialogue_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 @@ -128,7 +128,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * optional .RogueCommonDialogueInfo dialogue_info = 4; + * optional .RogueCommonDialogueInfo dialogue_info = 1; * @param value the dialogueInfo to set * @return this */ @@ -140,7 +140,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionInfo option_list = 1; + * repeated .RogueCommonDialogueOptionInfo option_list = 2; * @return whether the optionList field is set */ public boolean hasOptionList() { @@ -148,7 +148,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionInfo option_list = 1; + * repeated .RogueCommonDialogueOptionInfo option_list = 2; * @return this */ public RogueCommonDialogueDataInfo clearOptionList() { @@ -158,7 +158,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionInfo option_list = 1; + * repeated .RogueCommonDialogueOptionInfo option_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. @@ -173,7 +173,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionInfo option_list = 1; + * repeated .RogueCommonDialogueOptionInfo option_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 @@ -188,7 +188,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionInfo option_list = 1; + * repeated .RogueCommonDialogueOptionInfo option_list = 2; * @param value the optionList to add * @return this */ @@ -200,7 +200,7 @@ public final class RogueCommonDialogueDataInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionInfo option_list = 1; + * repeated .RogueCommonDialogueOptionInfo option_list = 2; * @param values the optionList to add * @return this */ @@ -284,16 +284,16 @@ public final class RogueCommonDialogueDataInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(eventUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(dialogueInfo); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < optionList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(optionList.get(i)); } } @@ -321,25 +321,25 @@ public final class RogueCommonDialogueDataInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 64: { // eventUniqueId eventUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // dialogueInfo - input.readMessage(dialogueInfo); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 10) { break; } } case 10: { + // dialogueInfo + input.readMessage(dialogueInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // optionList tag = input.readRepeatedMessage(optionList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueInfoOuterClass.java index c120f42..0c0b0f8 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueInfoOuterClass.java @@ -20,11 +20,12 @@ public final class RogueCommonDialogueInfoOuterClass { /** * 
-     * DIACKBJMGOM IECFCBIHCKG = 6;
-     * CBEPEJDDBHK HCNKEAOPIGF = 4;
+     *  JHFNBCAKNAP KNHAHDLIAPF = 5;
+     *  AGICBCNPMBF AOLAFEPHJFE = 12;
+     *  LMFCCGILDOH CJFHHFCGDDA = 15;
      *
* - * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 13; + * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 4; */ private final RogueCommonDialogueBasicInfoOuterClass.RogueCommonDialogueBasicInfo dialogueBasicInfo = RogueCommonDialogueBasicInfoOuterClass.RogueCommonDialogueBasicInfo.newInstance(); @@ -38,12 +39,12 @@ public final class RogueCommonDialogueInfoOuterClass { return new RogueCommonDialogueInfo(); } - public boolean hasOBCDHEEJEFH() { + public boolean hasDialogueInfo() { return (((bitField0_ & 0x00000001)) != 0); } - public RogueCommonDialogueInfo clearOBCDHEEJEFH() { - if (hasOBCDHEEJEFH()) { + public RogueCommonDialogueInfo clearDialogueInfo() { + if (hasDialogueInfo()) { clearDialogueBasicInfo(); } return this; @@ -51,11 +52,12 @@ public final class RogueCommonDialogueInfoOuterClass { /** * 
-     * DIACKBJMGOM IECFCBIHCKG = 6;
-     * CBEPEJDDBHK HCNKEAOPIGF = 4;
+     *  JHFNBCAKNAP KNHAHDLIAPF = 5;
+     *  AGICBCNPMBF AOLAFEPHJFE = 12;
+     *  LMFCCGILDOH CJFHHFCGDDA = 15;
      *
* - * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 13; + * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 4; * @return whether the dialogueBasicInfo field is set */ public boolean hasDialogueBasicInfo() { @@ -64,11 +66,12 @@ public final class RogueCommonDialogueInfoOuterClass { /** * 
-     * DIACKBJMGOM IECFCBIHCKG = 6;
-     * CBEPEJDDBHK HCNKEAOPIGF = 4;
+     *  JHFNBCAKNAP KNHAHDLIAPF = 5;
+     *  AGICBCNPMBF AOLAFEPHJFE = 12;
+     *  LMFCCGILDOH CJFHHFCGDDA = 15;
      *
* - * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 13; + * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 4; * @return this */ public RogueCommonDialogueInfo clearDialogueBasicInfo() { @@ -79,11 +82,12 @@ public final class RogueCommonDialogueInfoOuterClass { /** * 
-     * DIACKBJMGOM IECFCBIHCKG = 6;
-     * CBEPEJDDBHK HCNKEAOPIGF = 4;
+     *  JHFNBCAKNAP KNHAHDLIAPF = 5;
+     *  AGICBCNPMBF AOLAFEPHJFE = 12;
+     *  LMFCCGILDOH CJFHHFCGDDA = 15;
      *
* - * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 13; + * optional .RogueCommonDialogueBasicInfo dialogue_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. @@ -99,11 +103,12 @@ public final class RogueCommonDialogueInfoOuterClass { /** * 
-     * DIACKBJMGOM IECFCBIHCKG = 6;
-     * CBEPEJDDBHK HCNKEAOPIGF = 4;
+     *  JHFNBCAKNAP KNHAHDLIAPF = 5;
+     *  AGICBCNPMBF AOLAFEPHJFE = 12;
+     *  LMFCCGILDOH CJFHHFCGDDA = 15;
      *
* - * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 13; + * optional .RogueCommonDialogueBasicInfo dialogue_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 @@ -119,11 +124,12 @@ public final class RogueCommonDialogueInfoOuterClass { /** * 
-     * DIACKBJMGOM IECFCBIHCKG = 6;
-     * CBEPEJDDBHK HCNKEAOPIGF = 4;
+     *  JHFNBCAKNAP KNHAHDLIAPF = 5;
+     *  AGICBCNPMBF AOLAFEPHJFE = 12;
+     *  LMFCCGILDOH CJFHHFCGDDA = 15;
      *
* - * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 13; + * optional .RogueCommonDialogueBasicInfo dialogue_basic_info = 4; * @param value the dialogueBasicInfo to set * @return this */ @@ -194,7 +200,7 @@ public final class RogueCommonDialogueInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 34); output.writeMessageNoTag(dialogueBasicInfo); } } @@ -215,7 +221,7 @@ public final class RogueCommonDialogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 34: { // dialogueBasicInfo input.readMessage(dialogueBasicInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionBattleResultInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionBattleResultInfoOuterClass.java index 7698775..81986f3 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionBattleResultInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionBattleResultInfoOuterClass.java @@ -19,7 +19,7 @@ public final class RogueCommonDialogueOptionBattleResultInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 battle_event_id = 8; + * optional uint32 battle_event_id = 6; */ private int battleEventId; @@ -34,7 +34,7 @@ public final class RogueCommonDialogueOptionBattleResultInfoOuterClass { } /** - * optional uint32 battle_event_id = 8; + * optional uint32 battle_event_id = 6; * @return whether the battleEventId field is set */ public boolean hasBattleEventId() { @@ -42,7 +42,7 @@ public final class RogueCommonDialogueOptionBattleResultInfoOuterClass { } /** - * optional uint32 battle_event_id = 8; + * optional uint32 battle_event_id = 6; * @return this */ public RogueCommonDialogueOptionBattleResultInfo clearBattleEventId() { @@ -52,7 +52,7 @@ public final class RogueCommonDialogueOptionBattleResultInfoOuterClass { } /** - * optional uint32 battle_event_id = 8; + * optional uint32 battle_event_id = 6; * @return the battleEventId */ public int getBattleEventId() { @@ -60,7 +60,7 @@ public final class RogueCommonDialogueOptionBattleResultInfoOuterClass { } /** - * optional uint32 battle_event_id = 8; + * optional uint32 battle_event_id = 6; * @param value the battleEventId to set * @return this */ @@ -131,7 +131,7 @@ public final class RogueCommonDialogueOptionBattleResultInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(battleEventId); } } @@ -153,7 +153,7 @@ public final class RogueCommonDialogueOptionBattleResultInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 48: { // battleEventId battleEventId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionDisplayInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionDisplayInfoOuterClass.java index bc11846..5bd6311 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionDisplayInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionDisplayInfoOuterClass.java @@ -20,12 +20,12 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional float display_float_value = 10; + * optional float display_float_value = 7; */ private float displayFloatValue; /** - * optional int32 display_int_value = 6; + * optional int32 display_int_value = 3; */ private int displayIntValue; @@ -40,7 +40,7 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { } /** - * optional float display_float_value = 10; + * optional float display_float_value = 7; * @return whether the displayFloatValue field is set */ public boolean hasDisplayFloatValue() { @@ -48,7 +48,7 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { } /** - * optional float display_float_value = 10; + * optional float display_float_value = 7; * @return this */ public RogueCommonDialogueOptionDisplayInfo clearDisplayFloatValue() { @@ -58,7 +58,7 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { } /** - * optional float display_float_value = 10; + * optional float display_float_value = 7; * @return the displayFloatValue */ public float getDisplayFloatValue() { @@ -66,7 +66,7 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { } /** - * optional float display_float_value = 10; + * optional float display_float_value = 7; * @param value the displayFloatValue to set * @return this */ @@ -77,7 +77,7 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { } /** - * optional int32 display_int_value = 6; + * optional int32 display_int_value = 3; * @return whether the displayIntValue field is set */ public boolean hasDisplayIntValue() { @@ -85,7 +85,7 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { } /** - * optional int32 display_int_value = 6; + * optional int32 display_int_value = 3; * @return this */ public RogueCommonDialogueOptionDisplayInfo clearDisplayIntValue() { @@ -95,7 +95,7 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { } /** - * optional int32 display_int_value = 6; + * optional int32 display_int_value = 3; * @return the displayIntValue */ public int getDisplayIntValue() { @@ -103,7 +103,7 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { } /** - * optional int32 display_int_value = 6; + * optional int32 display_int_value = 3; * @param value the displayIntValue to set * @return this */ @@ -180,11 +180,11 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 85); + output.writeRawByte((byte) 61); output.writeFloatNoTag(displayFloatValue); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 24); output.writeInt32NoTag(displayIntValue); } } @@ -209,16 +209,16 @@ public final class RogueCommonDialogueOptionDisplayInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 85: { + case 61: { // displayFloatValue displayFloatValue = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 24) { break; } } - case 48: { + case 24: { // displayIntValue displayIntValue = input.readInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionInfoOuterClass.java index c667bf0..89a2798 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionInfoOuterClass.java @@ -20,12 +20,12 @@ public final class RogueCommonDialogueOptionInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 arg_id = 6; + * optional uint32 arg_id = 1; */ private int argId; /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 6; */ private int optionId; @@ -35,17 +35,17 @@ public final class RogueCommonDialogueOptionInfoOuterClass { private boolean isValid; /** - * optional bool confirm = 13; + * optional bool confirm = 7; */ private boolean confirm; /** - * optional .RogueCommonDialogueOptionDisplayInfo display_value = 14; + * optional .RogueCommonDialogueOptionDisplayInfo display_value = 11; */ private final RogueCommonDialogueOptionDisplayInfoOuterClass.RogueCommonDialogueOptionDisplayInfo displayValue = RogueCommonDialogueOptionDisplayInfoOuterClass.RogueCommonDialogueOptionDisplayInfo.newInstance(); /** - * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 8; + * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 12; */ private final RepeatedMessage optionResultInfo = RepeatedMessage.newEmptyInstance(RogueCommonDialogueOptionResultInfoOuterClass.RogueCommonDialogueOptionResultInfo.getFactory()); @@ -60,7 +60,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional uint32 arg_id = 6; + * optional uint32 arg_id = 1; * @return whether the argId field is set */ public boolean hasArgId() { @@ -68,7 +68,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional uint32 arg_id = 6; + * optional uint32 arg_id = 1; * @return this */ public RogueCommonDialogueOptionInfo clearArgId() { @@ -78,7 +78,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional uint32 arg_id = 6; + * optional uint32 arg_id = 1; * @return the argId */ public int getArgId() { @@ -86,7 +86,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional uint32 arg_id = 6; + * optional uint32 arg_id = 1; * @param value the argId to set * @return this */ @@ -97,7 +97,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 6; * @return whether the optionId field is set */ public boolean hasOptionId() { @@ -105,7 +105,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 6; * @return this */ public RogueCommonDialogueOptionInfo clearOptionId() { @@ -115,7 +115,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 6; * @return the optionId */ public int getOptionId() { @@ -123,7 +123,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 6; * @param value the optionId to set * @return this */ @@ -171,7 +171,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional bool confirm = 13; + * optional bool confirm = 7; * @return whether the confirm field is set */ public boolean hasConfirm() { @@ -179,7 +179,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional bool confirm = 13; + * optional bool confirm = 7; * @return this */ public RogueCommonDialogueOptionInfo clearConfirm() { @@ -189,7 +189,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional bool confirm = 13; + * optional bool confirm = 7; * @return the confirm */ public boolean getConfirm() { @@ -197,7 +197,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional bool confirm = 13; + * optional bool confirm = 7; * @param value the confirm to set * @return this */ @@ -208,7 +208,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional .RogueCommonDialogueOptionDisplayInfo display_value = 14; + * optional .RogueCommonDialogueOptionDisplayInfo display_value = 11; * @return whether the displayValue field is set */ public boolean hasDisplayValue() { @@ -216,7 +216,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional .RogueCommonDialogueOptionDisplayInfo display_value = 14; + * optional .RogueCommonDialogueOptionDisplayInfo display_value = 11; * @return this */ public RogueCommonDialogueOptionInfo clearDisplayValue() { @@ -226,7 +226,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional .RogueCommonDialogueOptionDisplayInfo display_value = 14; + * optional .RogueCommonDialogueOptionDisplayInfo display_value = 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. @@ -241,7 +241,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional .RogueCommonDialogueOptionDisplayInfo display_value = 14; + * optional .RogueCommonDialogueOptionDisplayInfo display_value = 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 @@ -256,7 +256,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * optional .RogueCommonDialogueOptionDisplayInfo display_value = 14; + * optional .RogueCommonDialogueOptionDisplayInfo display_value = 11; * @param value the displayValue to set * @return this */ @@ -268,7 +268,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 8; + * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 12; * @return whether the optionResultInfo field is set */ public boolean hasOptionResultInfo() { @@ -276,7 +276,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 8; + * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 12; * @return this */ public RogueCommonDialogueOptionInfo clearOptionResultInfo() { @@ -286,7 +286,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 8; + * repeated .RogueCommonDialogueOptionResultInfo option_result_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. @@ -301,7 +301,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 8; + * repeated .RogueCommonDialogueOptionResultInfo option_result_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 @@ -316,7 +316,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 8; + * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 12; * @param value the optionResultInfo to add * @return this */ @@ -328,7 +328,7 @@ public final class RogueCommonDialogueOptionInfoOuterClass { } /** - * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 8; + * repeated .RogueCommonDialogueOptionResultInfo option_result_info = 12; * @param values the optionResultInfo to add * @return this */ @@ -430,11 +430,11 @@ public final class RogueCommonDialogueOptionInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(argId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(optionId); } if ((bitField0_ & 0x00000004) != 0) { @@ -442,16 +442,16 @@ public final class RogueCommonDialogueOptionInfoOuterClass { output.writeBoolNoTag(isValid); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 56); output.writeBoolNoTag(confirm); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(displayValue); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < optionResultInfo.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 98); output.writeMessageNoTag(optionResultInfo.get(i)); } } @@ -488,16 +488,16 @@ public final class RogueCommonDialogueOptionInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 8: { // argId argId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 48) { break; } } - case 72: { + case 48: { // optionId optionId = input.readUInt32(); bitField0_ |= 0x00000002; @@ -511,29 +511,29 @@ public final class RogueCommonDialogueOptionInfoOuterClass { isValid = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 56) { break; } } - case 104: { + case 56: { // confirm confirm = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // displayValue input.readMessage(displayValue); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 66) { + if (tag != 98) { break; } } - case 66: { + case 98: { // optionResultInfo tag = input.readRepeatedMessage(optionResultInfo, tag); bitField0_ |= 0x00000020; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionResultInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionResultInfoOuterClass.java index 1facdb1..ef452d1 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionResultInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonDialogueOptionResultInfoOuterClass.java @@ -20,10 +20,10 @@ public final class RogueCommonDialogueOptionResultInfoOuterClass { /** * 
-     * OJAHMDLNMAK ACHLGHPPMNO = 3;
+     * ILNKLKJEIKF NJFNJKJPNAP = 2; // 0x18 -> 24 -> RogueOptionEffectNousValueInfo, nous_result_info
      *
* - * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 11; + * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 14; */ private final RogueCommonDialogueOptionBattleResultInfoOuterClass.RogueCommonDialogueOptionBattleResultInfo battleResultInfo = RogueCommonDialogueOptionBattleResultInfoOuterClass.RogueCommonDialogueOptionBattleResultInfo.newInstance(); @@ -50,10 +50,10 @@ public final class RogueCommonDialogueOptionResultInfoOuterClass { /** * 
-     * OJAHMDLNMAK ACHLGHPPMNO = 3;
+     * ILNKLKJEIKF NJFNJKJPNAP = 2; // 0x18 -> 24 -> RogueOptionEffectNousValueInfo, nous_result_info
      *
* - * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 11; + * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 14; * @return whether the battleResultInfo field is set */ public boolean hasBattleResultInfo() { @@ -62,10 +62,10 @@ public final class RogueCommonDialogueOptionResultInfoOuterClass { /** * 
-     * OJAHMDLNMAK ACHLGHPPMNO = 3;
+     * ILNKLKJEIKF NJFNJKJPNAP = 2; // 0x18 -> 24 -> RogueOptionEffectNousValueInfo, nous_result_info
      *
* - * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 11; + * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 14; * @return this */ public RogueCommonDialogueOptionResultInfo clearBattleResultInfo() { @@ -76,10 +76,10 @@ public final class RogueCommonDialogueOptionResultInfoOuterClass { /** * 
-     * OJAHMDLNMAK ACHLGHPPMNO = 3;
+     * ILNKLKJEIKF NJFNJKJPNAP = 2; // 0x18 -> 24 -> RogueOptionEffectNousValueInfo, nous_result_info
      *
* - * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 11; + * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_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. @@ -95,10 +95,10 @@ public final class RogueCommonDialogueOptionResultInfoOuterClass { /** * 
-     * OJAHMDLNMAK ACHLGHPPMNO = 3;
+     * ILNKLKJEIKF NJFNJKJPNAP = 2; // 0x18 -> 24 -> RogueOptionEffectNousValueInfo, nous_result_info
      *
* - * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 11; + * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_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 @@ -114,10 +114,10 @@ public final class RogueCommonDialogueOptionResultInfoOuterClass { /** * 
-     * OJAHMDLNMAK ACHLGHPPMNO = 3;
+     * ILNKLKJEIKF NJFNJKJPNAP = 2; // 0x18 -> 24 -> RogueOptionEffectNousValueInfo, nous_result_info
      *
* - * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 11; + * optional .RogueCommonDialogueOptionBattleResultInfo battle_result_info = 14; * @param value the battleResultInfo to set * @return this */ @@ -190,7 +190,7 @@ public final class RogueCommonDialogueOptionResultInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 114); output.writeMessageNoTag(battleResultInfo); } } @@ -212,7 +212,7 @@ public final class RogueCommonDialogueOptionResultInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 114: { // battleResultInfo input.readMessage(battleResultInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java index 9538c4e..65f177e 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 = 5; + * optional uint32 unique_id = 15; */ private int uniqueId; /** - * optional .RogueAction rogue_action = 12; + * optional .RogueAction rogue_action = 9; */ private final RogueActionOuterClass.RogueAction rogueAction = RogueActionOuterClass.RogueAction.newInstance(); @@ -39,7 +39,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 5; + * optional uint32 unique_id = 15; * @return whether the uniqueId field is set */ public boolean hasUniqueId() { @@ -47,7 +47,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 5; + * optional uint32 unique_id = 15; * @return this */ public RogueCommonPendingAction clearUniqueId() { @@ -57,7 +57,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 5; + * optional uint32 unique_id = 15; * @return the uniqueId */ public int getUniqueId() { @@ -65,7 +65,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 5; + * optional uint32 unique_id = 15; * @param value the uniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 12; + * optional .RogueAction rogue_action = 9; * @return whether the rogueAction field is set */ public boolean hasRogueAction() { @@ -84,7 +84,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 12; + * optional .RogueAction rogue_action = 9; * @return this */ public RogueCommonPendingAction clearRogueAction() { @@ -94,7 +94,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 12; + * optional .RogueAction rogue_action = 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 RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 12; + * optional .RogueAction rogue_action = 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 RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 12; + * optional .RogueAction rogue_action = 9; * @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) 40); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 74); output.writeMessageNoTag(rogueAction); } } @@ -226,16 +226,16 @@ public final class RogueCommonPendingActionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 120: { // uniqueId uniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 74) { break; } } - case 98: { + case 74: { // 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 65d57e6..78b3909 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_talent_coin = 12; - */ - private int curTalentCoin; - - /** - * optional uint32 cur_rogue_coin = 15; + * optional uint32 cur_rogue_coin = 6; */ private int curRogueCoin; + /** + * optional uint32 cur_talent_coin = 10; + */ + private int curTalentCoin; + private RogueCurVirtualItemInfo() { } @@ -39,62 +39,25 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_talent_coin = 12; - * @return whether the curTalentCoin field is set + * optional uint32 cur_rogue_coin = 6; + * @return whether the curRogueCoin field is set */ - public boolean hasCurTalentCoin() { + public boolean hasCurRogueCoin() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_talent_coin = 12; - * @return this - */ - public RogueCurVirtualItemInfo clearCurTalentCoin() { - bitField0_ &= ~0x00000001; - curTalentCoin = 0; - return this; - } - - /** - * optional uint32 cur_talent_coin = 12; - * @return the curTalentCoin - */ - public int getCurTalentCoin() { - return curTalentCoin; - } - - /** - * optional uint32 cur_talent_coin = 12; - * @param value the curTalentCoin to set - * @return this - */ - public RogueCurVirtualItemInfo setCurTalentCoin(final int value) { - bitField0_ |= 0x00000001; - curTalentCoin = value; - return this; - } - - /** - * optional uint32 cur_rogue_coin = 15; - * @return whether the curRogueCoin field is set - */ - public boolean hasCurRogueCoin() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_rogue_coin = 15; + * optional uint32 cur_rogue_coin = 6; * @return this */ public RogueCurVirtualItemInfo clearCurRogueCoin() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curRogueCoin = 0; return this; } /** - * optional uint32 cur_rogue_coin = 15; + * optional uint32 cur_rogue_coin = 6; * @return the curRogueCoin */ public int getCurRogueCoin() { @@ -102,23 +65,60 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_rogue_coin = 15; + * optional uint32 cur_rogue_coin = 6; * @param value the curRogueCoin to set * @return this */ public RogueCurVirtualItemInfo setCurRogueCoin(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; curRogueCoin = value; return this; } + /** + * optional uint32 cur_talent_coin = 10; + * @return whether the curTalentCoin field is set + */ + public boolean hasCurTalentCoin() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 cur_talent_coin = 10; + * @return this + */ + public RogueCurVirtualItemInfo clearCurTalentCoin() { + bitField0_ &= ~0x00000002; + curTalentCoin = 0; + return this; + } + + /** + * optional uint32 cur_talent_coin = 10; + * @return the curTalentCoin + */ + public int getCurTalentCoin() { + return curTalentCoin; + } + + /** + * optional uint32 cur_talent_coin = 10; + * @param value the curTalentCoin to set + * @return this + */ + public RogueCurVirtualItemInfo setCurTalentCoin(final int value) { + bitField0_ |= 0x00000002; + curTalentCoin = value; + return this; + } + @Override public RogueCurVirtualItemInfo copyFrom(final RogueCurVirtualItemInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curTalentCoin = other.curTalentCoin; curRogueCoin = other.curRogueCoin; + curTalentCoin = other.curTalentCoin; } return this; } @@ -129,12 +129,12 @@ public final class RogueCurVirtualItemInfoOuterClass { return this; } cachedSize = -1; - if (other.hasCurTalentCoin()) { - setCurTalentCoin(other.curTalentCoin); - } if (other.hasCurRogueCoin()) { setCurRogueCoin(other.curRogueCoin); } + if (other.hasCurTalentCoin()) { + setCurTalentCoin(other.curTalentCoin); + } return this; } @@ -145,8 +145,8 @@ public final class RogueCurVirtualItemInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - curTalentCoin = 0; curRogueCoin = 0; + curTalentCoin = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueCurVirtualItemInfoOuterClass { } RogueCurVirtualItemInfo other = (RogueCurVirtualItemInfo) o; return bitField0_ == other.bitField0_ - && (!hasCurTalentCoin() || curTalentCoin == other.curTalentCoin) - && (!hasCurRogueCoin() || curRogueCoin == other.curRogueCoin); + && (!hasCurRogueCoin() || curRogueCoin == other.curRogueCoin) + && (!hasCurTalentCoin() || curTalentCoin == other.curTalentCoin); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(curTalentCoin); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(curRogueCoin); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(curRogueCoin); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(curTalentCoin); } } @@ -190,10 +190,10 @@ public final class RogueCurVirtualItemInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curTalentCoin); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curRogueCoin); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curRogueCoin); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curTalentCoin); } return size; } @@ -205,18 +205,18 @@ public final class RogueCurVirtualItemInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // curTalentCoin - curTalentCoin = input.readUInt32(); + case 48: { + // curRogueCoin + curRogueCoin = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { - // curRogueCoin - curRogueCoin = input.readUInt32(); + case 80: { + // curTalentCoin + curTalentCoin = 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.curTalentCoin, curTalentCoin); + output.writeUInt32(FieldNames.curRogueCoin, curRogueCoin); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curRogueCoin, curRogueCoin); + output.writeUInt32(FieldNames.curTalentCoin, curTalentCoin); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RogueCurVirtualItemInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class RogueCurVirtualItemInfoOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class RogueCurVirtualItemInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curTalentCoin = FieldName.forField("curTalentCoin", "cur_talent_coin"); - static final FieldName curRogueCoin = FieldName.forField("curRogueCoin", "cur_rogue_coin"); + + static final FieldName curTalentCoin = FieldName.forField("curTalentCoin", "cur_talent_coin"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java index c4a3660..49d7e3f 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java @@ -23,48 +23,48 @@ public final class RogueCurrentInfoOuterClass { * PAOGLFPDNOA JGHAOFCGEMP = 3; * * - * optional .RogueStatus status = 12; + * optional .RogueStatus status = 7; */ private int status; /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 1; + * optional .RogueCommonPendingAction pending_action = 2; + */ + private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); + + /** + * optional .RogueVirtualItemInfo rogue_virtual_item = 6; */ private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItem = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance(); /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; - */ - private final RogueMiracleInfoOuterClass.RogueMiracleInfo rogueMiracleInfo = RogueMiracleInfoOuterClass.RogueMiracleInfo.newInstance(); - - /** - * 
-     *  bool GPOIMNADJOH = 14;
-     *
- * - * optional .RogueMapInfo room_map = 7; - */ - private final RogueMapInfoOuterClass.RogueMapInfo roomMap = RogueMapInfoOuterClass.RogueMapInfo.newInstance(); - - /** - * optional .RogueAeon rogue_aeon_info = 9; - */ - private final RogueAeonOuterClass.RogueAeon rogueAeonInfo = RogueAeonOuterClass.RogueAeon.newInstance(); - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 10; + * optional .RogueAvatarInfo rogue_avatar_info = 8; */ private final RogueAvatarInfoOuterClass.RogueAvatarInfo rogueAvatarInfo = RogueAvatarInfoOuterClass.RogueAvatarInfo.newInstance(); /** - * optional .RogueBuffInfo rogue_buff_info = 11; + * optional .RogueMiracleInfo rogue_miracle_info = 9; */ - private final RogueBuffInfoOuterClass.RogueBuffInfo rogueBuffInfo = RogueBuffInfoOuterClass.RogueBuffInfo.newInstance(); + private final RogueMiracleInfoOuterClass.RogueMiracleInfo rogueMiracleInfo = RogueMiracleInfoOuterClass.RogueMiracleInfo.newInstance(); /** - * optional .RogueCommonPendingAction pending_action = 13; + * optional .RogueAeon rogue_aeon_info = 10; */ - private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); + private final RogueAeonOuterClass.RogueAeon rogueAeonInfo = RogueAeonOuterClass.RogueAeon.newInstance(); + + /** + * 
+     *  bool GPOIMNADJOH = 5;
+     *
+ * + * optional .RogueMapInfo room_map = 13; + */ + private final RogueMapInfoOuterClass.RogueMapInfo roomMap = RogueMapInfoOuterClass.RogueMapInfo.newInstance(); + + /** + * optional .RogueBuffInfo rogue_buff_info = 15; + */ + private final RogueBuffInfoOuterClass.RogueBuffInfo rogueBuffInfo = RogueBuffInfoOuterClass.RogueBuffInfo.newInstance(); private RogueCurrentInfo() { } @@ -81,7 +81,7 @@ public final class RogueCurrentInfoOuterClass { * PAOGLFPDNOA JGHAOFCGEMP = 3; * * - * optional .RogueStatus status = 12; + * optional .RogueStatus status = 7; * @return whether the status field is set */ public boolean hasStatus() { @@ -93,7 +93,7 @@ public final class RogueCurrentInfoOuterClass { * PAOGLFPDNOA JGHAOFCGEMP = 3; * * - * optional .RogueStatus status = 12; + * optional .RogueStatus status = 7; * @return this */ public RogueCurrentInfo clearStatus() { @@ -107,7 +107,7 @@ public final class RogueCurrentInfoOuterClass { * PAOGLFPDNOA JGHAOFCGEMP = 3; * * - * optional .RogueStatus status = 12; + * optional .RogueStatus status = 7; * @return the status */ public RogueStatusOuterClass.RogueStatus getStatus() { @@ -144,7 +144,7 @@ public final class RogueCurrentInfoOuterClass { * PAOGLFPDNOA JGHAOFCGEMP = 3; * * - * optional .RogueStatus status = 12; + * optional .RogueStatus status = 7; * @param value the status to set * @return this */ @@ -155,25 +155,83 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 1; - * @return whether the rogueVirtualItem field is set + * optional .RogueCommonPendingAction pending_action = 2; + * @return whether the pendingAction field is set */ - public boolean hasRogueVirtualItem() { + public boolean hasPendingAction() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 1; + * optional .RogueCommonPendingAction pending_action = 2; + * @return this + */ + public RogueCurrentInfo clearPendingAction() { + bitField0_ &= ~0x00000002; + pendingAction.clear(); + return this; + } + + /** + * optional .RogueCommonPendingAction pending_action = 2; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutablePendingAction()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getPendingAction() { + return pendingAction; + } + + /** + * optional .RogueCommonPendingAction pending_action = 2; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() { + bitField0_ |= 0x00000002; + return pendingAction; + } + + /** + * optional .RogueCommonPendingAction pending_action = 2; + * @param value the pendingAction to set + * @return this + */ + public RogueCurrentInfo setPendingAction( + final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) { + bitField0_ |= 0x00000002; + pendingAction.copyFrom(value); + return this; + } + + /** + * optional .RogueVirtualItemInfo rogue_virtual_item = 6; + * @return whether the rogueVirtualItem field is set + */ + public boolean hasRogueVirtualItem() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RogueVirtualItemInfo rogue_virtual_item = 6; * @return this */ public RogueCurrentInfo clearRogueVirtualItem() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; rogueVirtualItem.clear(); return this; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 1; + * optional .RogueVirtualItemInfo rogue_virtual_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. @@ -187,7 +245,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 1; + * optional .RogueVirtualItemInfo rogue_virtual_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 @@ -196,42 +254,100 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getMutableRogueVirtualItem() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return rogueVirtualItem; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 1; + * optional .RogueVirtualItemInfo rogue_virtual_item = 6; * @param value the rogueVirtualItem to set * @return this */ public RogueCurrentInfo setRogueVirtualItem( final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; rogueVirtualItem.copyFrom(value); return this; } /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; - * @return whether the rogueMiracleInfo field is set + * optional .RogueAvatarInfo rogue_avatar_info = 8; + * @return whether the rogueAvatarInfo field is set */ - public boolean hasRogueMiracleInfo() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasRogueAvatarInfo() { + return (bitField0_ & 0x00000008) != 0; } /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; + * optional .RogueAvatarInfo rogue_avatar_info = 8; + * @return this + */ + public RogueCurrentInfo clearRogueAvatarInfo() { + bitField0_ &= ~0x00000008; + rogueAvatarInfo.clear(); + return this; + } + + /** + * optional .RogueAvatarInfo rogue_avatar_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 #getMutableRogueAvatarInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAvatarInfoOuterClass.RogueAvatarInfo getRogueAvatarInfo() { + return rogueAvatarInfo; + } + + /** + * optional .RogueAvatarInfo rogue_avatar_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 RogueAvatarInfoOuterClass.RogueAvatarInfo getMutableRogueAvatarInfo() { + bitField0_ |= 0x00000008; + return rogueAvatarInfo; + } + + /** + * optional .RogueAvatarInfo rogue_avatar_info = 8; + * @param value the rogueAvatarInfo to set + * @return this + */ + public RogueCurrentInfo setRogueAvatarInfo( + final RogueAvatarInfoOuterClass.RogueAvatarInfo value) { + bitField0_ |= 0x00000008; + rogueAvatarInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueMiracleInfo rogue_miracle_info = 9; + * @return whether the rogueMiracleInfo field is set + */ + public boolean hasRogueMiracleInfo() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueMiracleInfo rogue_miracle_info = 9; * @return this */ public RogueCurrentInfo clearRogueMiracleInfo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000010; rogueMiracleInfo.clear(); return this; } /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; + * optional .RogueMiracleInfo rogue_miracle_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. @@ -245,7 +361,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; + * optional .RogueMiracleInfo rogue_miracle_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 @@ -254,54 +370,111 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueMiracleInfoOuterClass.RogueMiracleInfo getMutableRogueMiracleInfo() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000010; return rogueMiracleInfo; } /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; + * optional .RogueMiracleInfo rogue_miracle_info = 9; * @param value the rogueMiracleInfo to set * @return this */ public RogueCurrentInfo setRogueMiracleInfo( final RogueMiracleInfoOuterClass.RogueMiracleInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000010; rogueMiracleInfo.copyFrom(value); return this; } /** - * 
-     *  bool GPOIMNADJOH = 14;
-     *
- * - * optional .RogueMapInfo room_map = 7; - * @return whether the roomMap field is set + * optional .RogueAeon rogue_aeon_info = 10; + * @return whether the rogueAeonInfo field is set */ - public boolean hasRoomMap() { - return (bitField0_ & 0x00000008) != 0; + public boolean hasRogueAeonInfo() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .RogueAeon rogue_aeon_info = 10; + * @return this + */ + public RogueCurrentInfo clearRogueAeonInfo() { + bitField0_ &= ~0x00000020; + rogueAeonInfo.clear(); + return this; + } + + /** + * optional .RogueAeon rogue_aeon_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 #getMutableRogueAeonInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAeonOuterClass.RogueAeon getRogueAeonInfo() { + return rogueAeonInfo; + } + + /** + * optional .RogueAeon rogue_aeon_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 RogueAeonOuterClass.RogueAeon getMutableRogueAeonInfo() { + bitField0_ |= 0x00000020; + return rogueAeonInfo; + } + + /** + * optional .RogueAeon rogue_aeon_info = 10; + * @param value the rogueAeonInfo to set + * @return this + */ + public RogueCurrentInfo setRogueAeonInfo(final RogueAeonOuterClass.RogueAeon value) { + bitField0_ |= 0x00000020; + rogueAeonInfo.copyFrom(value); + return this; } /** * 
-     *  bool GPOIMNADJOH = 14;
+     *  bool GPOIMNADJOH = 5;
      *
* - * optional .RogueMapInfo room_map = 7; + * optional .RogueMapInfo room_map = 13; + * @return whether the roomMap field is set + */ + public boolean hasRoomMap() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * 
+     *  bool GPOIMNADJOH = 5;
+     *
+ * + * optional .RogueMapInfo room_map = 13; * @return this */ public RogueCurrentInfo clearRoomMap() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000040; roomMap.clear(); return this; } /** * 
-     *  bool GPOIMNADJOH = 14;
+     *  bool GPOIMNADJOH = 5;
      *
* - * optional .RogueMapInfo room_map = 7; + * optional .RogueMapInfo room_map = 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. @@ -316,10 +489,10 @@ public final class RogueCurrentInfoOuterClass { /** * 
-     *  bool GPOIMNADJOH = 14;
+     *  bool GPOIMNADJOH = 5;
      *
* - * optional .RogueMapInfo room_map = 7; + * optional .RogueMapInfo room_map = 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 @@ -328,160 +501,45 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000040; return roomMap; } /** * 
-     *  bool GPOIMNADJOH = 14;
+     *  bool GPOIMNADJOH = 5;
      *
* - * optional .RogueMapInfo room_map = 7; + * optional .RogueMapInfo room_map = 13; * @param value the roomMap to set * @return this */ public RogueCurrentInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000040; roomMap.copyFrom(value); return this; } /** - * optional .RogueAeon rogue_aeon_info = 9; - * @return whether the rogueAeonInfo field is set - */ - public boolean hasRogueAeonInfo() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueAeon rogue_aeon_info = 9; - * @return this - */ - public RogueCurrentInfo clearRogueAeonInfo() { - bitField0_ &= ~0x00000010; - rogueAeonInfo.clear(); - return this; - } - - /** - * optional .RogueAeon rogue_aeon_info = 9; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * 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 = 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 RogueAeonOuterClass.RogueAeon getMutableRogueAeonInfo() { - bitField0_ |= 0x00000010; - return rogueAeonInfo; - } - - /** - * optional .RogueAeon rogue_aeon_info = 9; - * @param value the rogueAeonInfo to set - * @return this - */ - public RogueCurrentInfo setRogueAeonInfo(final RogueAeonOuterClass.RogueAeon value) { - bitField0_ |= 0x00000010; - rogueAeonInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 10; - * @return whether the rogueAvatarInfo field is set - */ - public boolean hasRogueAvatarInfo() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 10; - * @return this - */ - public RogueCurrentInfo clearRogueAvatarInfo() { - bitField0_ &= ~0x00000020; - rogueAvatarInfo.clear(); - return this; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 10; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueAvatarInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAvatarInfoOuterClass.RogueAvatarInfo getRogueAvatarInfo() { - return rogueAvatarInfo; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 10; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueAvatarInfoOuterClass.RogueAvatarInfo getMutableRogueAvatarInfo() { - bitField0_ |= 0x00000020; - return rogueAvatarInfo; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 10; - * @param value the rogueAvatarInfo to set - * @return this - */ - public RogueCurrentInfo setRogueAvatarInfo( - final RogueAvatarInfoOuterClass.RogueAvatarInfo value) { - bitField0_ |= 0x00000020; - rogueAvatarInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueBuffInfo rogue_buff_info = 11; + * optional .RogueBuffInfo rogue_buff_info = 15; * @return whether the rogueBuffInfo field is set */ public boolean hasRogueBuffInfo() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * optional .RogueBuffInfo rogue_buff_info = 11; + * optional .RogueBuffInfo rogue_buff_info = 15; * @return this */ public RogueCurrentInfo clearRogueBuffInfo() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000080; rogueBuffInfo.clear(); return this; } /** - * optional .RogueBuffInfo rogue_buff_info = 11; + * optional .RogueBuffInfo rogue_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. @@ -495,7 +553,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueBuffInfo rogue_buff_info = 11; + * optional .RogueBuffInfo rogue_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 @@ -504,92 +562,34 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueBuffInfoOuterClass.RogueBuffInfo getMutableRogueBuffInfo() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; return rogueBuffInfo; } /** - * optional .RogueBuffInfo rogue_buff_info = 11; + * optional .RogueBuffInfo rogue_buff_info = 15; * @param value the rogueBuffInfo to set * @return this */ public RogueCurrentInfo setRogueBuffInfo(final RogueBuffInfoOuterClass.RogueBuffInfo value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; rogueBuffInfo.copyFrom(value); return this; } - /** - * optional .RogueCommonPendingAction pending_action = 13; - * @return whether the pendingAction field is set - */ - public boolean hasPendingAction() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional .RogueCommonPendingAction pending_action = 13; - * @return this - */ - public RogueCurrentInfo clearPendingAction() { - bitField0_ &= ~0x00000080; - pendingAction.clear(); - return this; - } - - /** - * optional .RogueCommonPendingAction pending_action = 13; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutablePendingAction()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getPendingAction() { - return pendingAction; - } - - /** - * optional .RogueCommonPendingAction pending_action = 13; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() { - bitField0_ |= 0x00000080; - return pendingAction; - } - - /** - * optional .RogueCommonPendingAction pending_action = 13; - * @param value the pendingAction to set - * @return this - */ - public RogueCurrentInfo setPendingAction( - final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) { - bitField0_ |= 0x00000080; - pendingAction.copyFrom(value); - return this; - } - @Override public RogueCurrentInfo copyFrom(final RogueCurrentInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; status = other.status; - rogueVirtualItem.copyFrom(other.rogueVirtualItem); - rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); - roomMap.copyFrom(other.roomMap); - rogueAeonInfo.copyFrom(other.rogueAeonInfo); - rogueAvatarInfo.copyFrom(other.rogueAvatarInfo); - rogueBuffInfo.copyFrom(other.rogueBuffInfo); pendingAction.copyFrom(other.pendingAction); + rogueVirtualItem.copyFrom(other.rogueVirtualItem); + rogueAvatarInfo.copyFrom(other.rogueAvatarInfo); + rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); + rogueAeonInfo.copyFrom(other.rogueAeonInfo); + roomMap.copyFrom(other.roomMap); + rogueBuffInfo.copyFrom(other.rogueBuffInfo); } return this; } @@ -603,27 +603,27 @@ public final class RogueCurrentInfoOuterClass { if (other.hasStatus()) { setStatusValue(other.status); } + if (other.hasPendingAction()) { + getMutablePendingAction().mergeFrom(other.pendingAction); + } if (other.hasRogueVirtualItem()) { getMutableRogueVirtualItem().mergeFrom(other.rogueVirtualItem); } - if (other.hasRogueMiracleInfo()) { - getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); - } - if (other.hasRoomMap()) { - getMutableRoomMap().mergeFrom(other.roomMap); - } - if (other.hasRogueAeonInfo()) { - getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); - } if (other.hasRogueAvatarInfo()) { getMutableRogueAvatarInfo().mergeFrom(other.rogueAvatarInfo); } + if (other.hasRogueMiracleInfo()) { + getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); + } + if (other.hasRogueAeonInfo()) { + getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); + } + if (other.hasRoomMap()) { + getMutableRoomMap().mergeFrom(other.roomMap); + } if (other.hasRogueBuffInfo()) { getMutableRogueBuffInfo().mergeFrom(other.rogueBuffInfo); } - if (other.hasPendingAction()) { - getMutablePendingAction().mergeFrom(other.pendingAction); - } return this; } @@ -635,13 +635,13 @@ public final class RogueCurrentInfoOuterClass { cachedSize = -1; bitField0_ = 0; status = 0; - rogueVirtualItem.clear(); - rogueMiracleInfo.clear(); - roomMap.clear(); - rogueAeonInfo.clear(); - rogueAvatarInfo.clear(); - rogueBuffInfo.clear(); pendingAction.clear(); + rogueVirtualItem.clear(); + rogueAvatarInfo.clear(); + rogueMiracleInfo.clear(); + rogueAeonInfo.clear(); + roomMap.clear(); + rogueBuffInfo.clear(); return this; } @@ -652,13 +652,13 @@ public final class RogueCurrentInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueVirtualItem.clearQuick(); - rogueMiracleInfo.clearQuick(); - roomMap.clearQuick(); - rogueAeonInfo.clearQuick(); - rogueAvatarInfo.clearQuick(); - rogueBuffInfo.clearQuick(); pendingAction.clearQuick(); + rogueVirtualItem.clearQuick(); + rogueAvatarInfo.clearQuick(); + rogueMiracleInfo.clearQuick(); + rogueAeonInfo.clearQuick(); + roomMap.clearQuick(); + rogueBuffInfo.clearQuick(); return this; } @@ -673,48 +673,48 @@ public final class RogueCurrentInfoOuterClass { RogueCurrentInfo other = (RogueCurrentInfo) o; return bitField0_ == other.bitField0_ && (!hasStatus() || status == other.status) + && (!hasPendingAction() || pendingAction.equals(other.pendingAction)) && (!hasRogueVirtualItem() || rogueVirtualItem.equals(other.rogueVirtualItem)) - && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)) - && (!hasRoomMap() || roomMap.equals(other.roomMap)) - && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) && (!hasRogueAvatarInfo() || rogueAvatarInfo.equals(other.rogueAvatarInfo)) - && (!hasRogueBuffInfo() || rogueBuffInfo.equals(other.rogueBuffInfo)) - && (!hasPendingAction() || pendingAction.equals(other.pendingAction)); + && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)) + && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) + && (!hasRoomMap() || roomMap.equals(other.roomMap)) + && (!hasRogueBuffInfo() || rogueBuffInfo.equals(other.rogueBuffInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(rogueVirtualItem); + output.writeRawByte((byte) 18); + output.writeMessageNoTag(pendingAction); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(rogueMiracleInfo); + output.writeRawByte((byte) 50); + output.writeMessageNoTag(rogueVirtualItem); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(roomMap); + output.writeRawByte((byte) 66); + output.writeMessageNoTag(rogueAvatarInfo); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 74); - output.writeMessageNoTag(rogueAeonInfo); + output.writeMessageNoTag(rogueMiracleInfo); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 82); - output.writeMessageNoTag(rogueAvatarInfo); + output.writeMessageNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(rogueBuffInfo); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(roomMap); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(pendingAction); + output.writeRawByte((byte) 122); + output.writeMessageNoTag(rogueBuffInfo); } } @@ -725,25 +725,25 @@ public final class RogueCurrentInfoOuterClass { size += 1 + ProtoSink.computeEnumSizeNoTag(status); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItem); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(roomMap); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAvatarInfo); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(roomMap); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffInfo); } return size; } @@ -755,7 +755,7 @@ public final class RogueCurrentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 56: { // status final int value = input.readInt32(); if (RogueStatusOuterClass.RogueStatus.forNumber(value) != null) { @@ -763,31 +763,31 @@ public final class RogueCurrentInfoOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 10) { - break; - } - } - case 10: { - // rogueVirtualItem - input.readMessage(rogueVirtualItem); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // rogueMiracleInfo - input.readMessage(rogueMiracleInfo); - bitField0_ |= 0x00000004; + // pendingAction + input.readMessage(pendingAction); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 50) { break; } } - case 58: { - // roomMap - input.readMessage(roomMap); + case 50: { + // rogueVirtualItem + input.readMessage(rogueVirtualItem); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { + // rogueAvatarInfo + input.readMessage(rogueAvatarInfo); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 74) { @@ -795,8 +795,8 @@ public final class RogueCurrentInfoOuterClass { } } case 74: { - // rogueAeonInfo - input.readMessage(rogueAeonInfo); + // rogueMiracleInfo + input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 82) { @@ -804,26 +804,26 @@ public final class RogueCurrentInfoOuterClass { } } case 82: { - // rogueAvatarInfo - input.readMessage(rogueAvatarInfo); + // rogueAeonInfo + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { - // rogueBuffInfo - input.readMessage(rogueBuffInfo); - bitField0_ |= 0x00000040; - tag = input.readTag(); if (tag != 106) { break; } } case 106: { - // pendingAction - input.readMessage(pendingAction); + // roomMap + input.readMessage(roomMap); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // rogueBuffInfo + input.readMessage(rogueBuffInfo); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { @@ -851,25 +851,25 @@ public final class RogueCurrentInfoOuterClass { output.writeEnum(FieldNames.status, status, RogueStatusOuterClass.RogueStatus.converter()); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueVirtualItem, rogueVirtualItem); + output.writeMessage(FieldNames.pendingAction, pendingAction); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); + output.writeMessage(FieldNames.rogueVirtualItem, rogueVirtualItem); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.roomMap, roomMap); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.rogueAvatarInfo, rogueAvatarInfo); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.rogueBuffInfo, rogueBuffInfo); + output.writeMessage(FieldNames.roomMap, roomMap); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.pendingAction, pendingAction); + output.writeMessage(FieldNames.rogueBuffInfo, rogueBuffInfo); } output.endObject(); } @@ -897,11 +897,11 @@ public final class RogueCurrentInfoOuterClass { } break; } - case 2090167940: - case -856063476: { - if (input.isAtField(FieldNames.rogueVirtualItem)) { + case -110680403: + case 1646545374: { + if (input.isAtField(FieldNames.pendingAction)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueVirtualItem); + input.readMessage(pendingAction); bitField0_ |= 0x00000002; } } else { @@ -909,11 +909,11 @@ public final class RogueCurrentInfoOuterClass { } break; } - case -452511099: - case 1925436929: { - if (input.isAtField(FieldNames.rogueMiracleInfo)) { + case 2090167940: + case -856063476: { + if (input.isAtField(FieldNames.rogueVirtualItem)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueMiracleInfo); + input.readMessage(rogueVirtualItem); bitField0_ |= 0x00000004; } } else { @@ -921,35 +921,35 @@ public final class RogueCurrentInfoOuterClass { } break; } - case 1379875457: - case -172986376: { - if (input.isAtField(FieldNames.roomMap)) { - if (!input.trySkipNullValue()) { - input.readMessage(roomMap); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1685018549: - case -1375922619: { - if (input.isAtField(FieldNames.rogueAeonInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueAeonInfo); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case -1966631135: case 667955439: { if (input.isAtField(FieldNames.rogueAvatarInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueAvatarInfo); + bitField0_ |= 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 -1685018549: + case -1375922619: { + if (input.isAtField(FieldNames.rogueAeonInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000020; } } else { @@ -957,23 +957,23 @@ public final class RogueCurrentInfoOuterClass { } break; } + case 1379875457: + case -172986376: { + if (input.isAtField(FieldNames.roomMap)) { + if (!input.trySkipNullValue()) { + input.readMessage(roomMap); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } case 1107898267: case -694847243: { if (input.isAtField(FieldNames.rogueBuffInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueBuffInfo); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case -110680403: - case 1646545374: { - if (input.isAtField(FieldNames.pendingAction)) { - if (!input.trySkipNullValue()) { - input.readMessage(pendingAction); bitField0_ |= 0x00000080; } } else { @@ -1036,19 +1036,19 @@ public final class RogueCurrentInfoOuterClass { static class FieldNames { static final FieldName status = FieldName.forField("status"); + static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action"); + static final FieldName rogueVirtualItem = FieldName.forField("rogueVirtualItem", "rogue_virtual_item"); - static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); - - static final FieldName roomMap = FieldName.forField("roomMap", "room_map"); - - static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); - static final FieldName rogueAvatarInfo = FieldName.forField("rogueAvatarInfo", "rogue_avatar_info"); - static final FieldName rogueBuffInfo = FieldName.forField("rogueBuffInfo", "rogue_buff_info"); + static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); - static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action"); + static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); + + static final FieldName roomMap = FieldName.forField("roomMap", "room_map"); + + static final FieldName rogueBuffInfo = FieldName.forField("rogueBuffInfo", "rogue_buff_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java index 548d6e8..99d419b 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java @@ -20,27 +20,27 @@ public final class RogueDialogueEventParamOuterClass { private static final long serialVersionUID = 0L; /** - * optional float ratio = 9; + * optional float ratio = 6; */ private float ratio; /** - * optional uint32 arg_id = 4; + * optional uint32 arg_id = 5; */ private int argId; /** - * optional uint32 dialogue_event_id = 7; + * optional uint32 dialogue_event_id = 13; */ private int dialogueEventId; /** - * optional sint32 int_value = 5; + * optional sint32 int_value = 15; */ private int intValue; /** - * optional bool is_valid = 12; + * optional bool is_valid = 11; */ private boolean isValid; @@ -55,7 +55,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 9; + * optional float ratio = 6; * @return whether the ratio field is set */ public boolean hasRatio() { @@ -63,7 +63,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 9; + * optional float ratio = 6; * @return this */ public RogueDialogueEventParam clearRatio() { @@ -73,7 +73,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 9; + * optional float ratio = 6; * @return the ratio */ public float getRatio() { @@ -81,7 +81,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 9; + * optional float ratio = 6; * @param value the ratio to set * @return this */ @@ -92,7 +92,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 arg_id = 4; + * optional uint32 arg_id = 5; * @return whether the argId field is set */ public boolean hasArgId() { @@ -100,7 +100,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 arg_id = 4; + * optional uint32 arg_id = 5; * @return this */ public RogueDialogueEventParam clearArgId() { @@ -110,7 +110,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 arg_id = 4; + * optional uint32 arg_id = 5; * @return the argId */ public int getArgId() { @@ -118,7 +118,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 arg_id = 4; + * optional uint32 arg_id = 5; * @param value the argId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 7; + * optional uint32 dialogue_event_id = 13; * @return whether the dialogueEventId field is set */ public boolean hasDialogueEventId() { @@ -137,7 +137,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 7; + * optional uint32 dialogue_event_id = 13; * @return this */ public RogueDialogueEventParam clearDialogueEventId() { @@ -147,7 +147,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 7; + * optional uint32 dialogue_event_id = 13; * @return the dialogueEventId */ public int getDialogueEventId() { @@ -155,7 +155,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 7; + * optional uint32 dialogue_event_id = 13; * @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 = 15; * @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 = 15; * @return this */ public RogueDialogueEventParam clearIntValue() { @@ -184,7 +184,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 5; + * optional sint32 int_value = 15; * @return the intValue */ public int getIntValue() { @@ -192,7 +192,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 5; + * optional sint32 int_value = 15; * @param value the intValue to set * @return this */ @@ -203,7 +203,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 12; + * optional bool is_valid = 11; * @return whether the isValid field is set */ public boolean hasIsValid() { @@ -211,7 +211,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 12; + * optional bool is_valid = 11; * @return this */ public RogueDialogueEventParam clearIsValid() { @@ -221,7 +221,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 12; + * optional bool is_valid = 11; * @return the isValid */ public boolean getIsValid() { @@ -229,7 +229,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 12; + * optional bool is_valid = 11; * @param value the isValid to set * @return this */ @@ -322,23 +322,23 @@ public final class RogueDialogueEventParamOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 77); + output.writeRawByte((byte) 53); output.writeFloatNoTag(ratio); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(argId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(dialogueEventId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 120); output.writeSInt32NoTag(intValue); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeBoolNoTag(isValid); } } @@ -371,43 +371,43 @@ public final class RogueDialogueEventParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 77: { + case 53: { // ratio ratio = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // argId - argId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // dialogueEventId - dialogueEventId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 40) { break; } } case 40: { + // argId + argId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // dialogueEventId + dialogueEventId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // intValue intValue = input.readSInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { + case 88: { // isValid isValid = input.readBool(); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java index e372767..03f7aa0 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java @@ -19,66 +19,70 @@ public final class RogueFinishInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 pass_room_count = 1; + * optional uint32 pass_room_count = 2; */ private int passRoomCount; /** - * optional uint32 total_score = 9; - */ - private int totalScore; - - /** - * optional uint32 taken_score = 15; + * 
+     *  uint32 CNIIIJODKJF = 10
+     *
+ * + * optional uint32 taken_score = 4; */ private int takenScore; /** - * optional uint32 area_id = 1131; + * optional uint32 total_score = 14; */ - private int areaId; + private int totalScore; /** * 
      *  unfinished, idk those
      *
* - * optional uint32 reach_room_count = 1818; + * optional uint32 reach_room_count = 508; */ private int reachRoomCount; + /** + * optional uint32 area_id = 859; + */ + private int areaId; + /** * 
-     *  could be 10?
+     *  could be 12?
      *
* - * optional bool is_win = 4; + * optional bool is_win = 5; */ private boolean isWin; /** * 
-     *  may be 5
+     *  may be 15
      *
* - * optional .RogueScoreRewardInfo cur_score_reward_info = 2; - */ - private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo curScoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); - - /** - * 
-     *  may be 2
-     *
- * - * optional .RogueScoreRewardInfo score_reward_info = 5; + * optional .RogueScoreRewardInfo score_reward_info = 9; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); /** - * optional .RogueRecordInfo record_info = 14; + * optional .RogueRecordInfo record_info = 11; */ private final RogueRecordInfoOuterClass.RogueRecordInfo recordInfo = RogueRecordInfoOuterClass.RogueRecordInfo.newInstance(); + /** + * 
+     *  may be 9
+     *
+ * + * optional .RogueScoreRewardInfo cur_score_reward_info = 15; + */ + private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo curScoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); + private RogueFinishInfo() { } @@ -90,7 +94,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 pass_room_count = 1; + * optional uint32 pass_room_count = 2; * @return whether the passRoomCount field is set */ public boolean hasPassRoomCount() { @@ -98,7 +102,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 pass_room_count = 1; + * optional uint32 pass_room_count = 2; * @return this */ public RogueFinishInfo clearPassRoomCount() { @@ -108,7 +112,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 pass_room_count = 1; + * optional uint32 pass_room_count = 2; * @return the passRoomCount */ public int getPassRoomCount() { @@ -116,7 +120,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 pass_room_count = 1; + * optional uint32 pass_room_count = 2; * @param value the passRoomCount to set * @return this */ @@ -127,62 +131,37 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 total_score = 9; - * @return whether the totalScore field is set + * 
+     *  uint32 CNIIIJODKJF = 10
+     *
+ * + * optional uint32 taken_score = 4; + * @return whether the takenScore field is set */ - public boolean hasTotalScore() { + public boolean hasTakenScore() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 total_score = 9; - * @return this - */ - public RogueFinishInfo clearTotalScore() { - bitField0_ &= ~0x00000002; - totalScore = 0; - return this; - } - - /** - * optional uint32 total_score = 9; - * @return the totalScore - */ - public int getTotalScore() { - return totalScore; - } - - /** - * optional uint32 total_score = 9; - * @param value the totalScore to set - * @return this - */ - public RogueFinishInfo setTotalScore(final int value) { - bitField0_ |= 0x00000002; - totalScore = value; - return this; - } - - /** - * optional uint32 taken_score = 15; - * @return whether the takenScore field is set - */ - public boolean hasTakenScore() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 taken_score = 15; + * 
+     *  uint32 CNIIIJODKJF = 10
+     *
+ * + * optional uint32 taken_score = 4; * @return this */ public RogueFinishInfo clearTakenScore() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; takenScore = 0; return this; } /** - * optional uint32 taken_score = 15; + * 
+     *  uint32 CNIIIJODKJF = 10
+     *
+ * + * optional uint32 taken_score = 4; * @return the takenScore */ public int getTakenScore() { @@ -190,75 +169,79 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 taken_score = 15; + * 
+     *  uint32 CNIIIJODKJF = 10
+     *
+ * + * optional uint32 taken_score = 4; * @param value the takenScore to set * @return this */ public RogueFinishInfo setTakenScore(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; takenScore = value; return this; } /** - * optional uint32 area_id = 1131; - * @return whether the areaId field is set + * optional uint32 total_score = 14; + * @return whether the totalScore field is set */ - public boolean hasAreaId() { + public boolean hasTotalScore() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 total_score = 14; + * @return this + */ + public RogueFinishInfo clearTotalScore() { + bitField0_ &= ~0x00000004; + totalScore = 0; + return this; + } + + /** + * optional uint32 total_score = 14; + * @return the totalScore + */ + public int getTotalScore() { + return totalScore; + } + + /** + * optional uint32 total_score = 14; + * @param value the totalScore to set + * @return this + */ + public RogueFinishInfo setTotalScore(final int value) { + bitField0_ |= 0x00000004; + totalScore = value; + return this; + } + + /** + * 
+     *  unfinished, idk those
+     *
+ * + * optional uint32 reach_room_count = 508; + * @return whether the reachRoomCount field is set + */ + public boolean hasReachRoomCount() { return (bitField0_ & 0x00000008) != 0; } - /** - * optional uint32 area_id = 1131; - * @return this - */ - public RogueFinishInfo clearAreaId() { - bitField0_ &= ~0x00000008; - areaId = 0; - return this; - } - - /** - * optional uint32 area_id = 1131; - * @return the areaId - */ - public int getAreaId() { - return areaId; - } - - /** - * optional uint32 area_id = 1131; - * @param value the areaId to set - * @return this - */ - public RogueFinishInfo setAreaId(final int value) { - bitField0_ |= 0x00000008; - areaId = value; - return this; - } - /** * 
      *  unfinished, idk those
      *
* - * optional uint32 reach_room_count = 1818; - * @return whether the reachRoomCount field is set - */ - public boolean hasReachRoomCount() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * 
-     *  unfinished, idk those
-     *
- * - * optional uint32 reach_room_count = 1818; + * optional uint32 reach_room_count = 508; * @return this */ public RogueFinishInfo clearReachRoomCount() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; reachRoomCount = 0; return this; } @@ -268,7 +251,7 @@ public final class RogueFinishInfoOuterClass { * unfinished, idk those * * - * optional uint32 reach_room_count = 1818; + * optional uint32 reach_room_count = 508; * @return the reachRoomCount */ public int getReachRoomCount() { @@ -280,22 +263,59 @@ public final class RogueFinishInfoOuterClass { * unfinished, idk those * * - * optional uint32 reach_room_count = 1818; + * optional uint32 reach_room_count = 508; * @param value the reachRoomCount to set * @return this */ public RogueFinishInfo setReachRoomCount(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; reachRoomCount = value; return this; } + /** + * optional uint32 area_id = 859; + * @return whether the areaId field is set + */ + public boolean hasAreaId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 area_id = 859; + * @return this + */ + public RogueFinishInfo clearAreaId() { + bitField0_ &= ~0x00000010; + areaId = 0; + return this; + } + + /** + * optional uint32 area_id = 859; + * @return the areaId + */ + public int getAreaId() { + return areaId; + } + + /** + * optional uint32 area_id = 859; + * @param value the areaId to set + * @return this + */ + public RogueFinishInfo setAreaId(final int value) { + bitField0_ |= 0x00000010; + areaId = value; + return this; + } + /** * 
-     *  could be 10?
+     *  could be 12?
      *
* - * optional bool is_win = 4; + * optional bool is_win = 5; * @return whether the isWin field is set */ public boolean hasIsWin() { @@ -304,10 +324,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  could be 10?
+     *  could be 12?
      *
* - * optional bool is_win = 4; + * optional bool is_win = 5; * @return this */ public RogueFinishInfo clearIsWin() { @@ -318,10 +338,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  could be 10?
+     *  could be 12?
      *
* - * optional bool is_win = 4; + * optional bool is_win = 5; * @return the isWin */ public boolean getIsWin() { @@ -330,10 +350,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  could be 10?
+     *  could be 12?
      *
* - * optional bool is_win = 4; + * optional bool is_win = 5; * @param value the isWin to set * @return this */ @@ -345,114 +365,36 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  may be 5
+     *  may be 15
      *
* - * optional .RogueScoreRewardInfo cur_score_reward_info = 2; - * @return whether the curScoreRewardInfo field is set + * optional .RogueScoreRewardInfo score_reward_info = 9; + * @return whether the scoreRewardInfo field is set */ - public boolean hasCurScoreRewardInfo() { + public boolean hasScoreRewardInfo() { return (bitField0_ & 0x00000040) != 0; } /** * 
-     *  may be 5
+     *  may be 15
      *
* - * optional .RogueScoreRewardInfo cur_score_reward_info = 2; - * @return this - */ - public RogueFinishInfo clearCurScoreRewardInfo() { - bitField0_ &= ~0x00000040; - curScoreRewardInfo.clear(); - return this; - } - - /** - * 
-     *  may be 5
-     *
- * - * optional .RogueScoreRewardInfo cur_score_reward_info = 2; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableCurScoreRewardInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getCurScoreRewardInfo() { - return curScoreRewardInfo; - } - - /** - * 
-     *  may be 5
-     *
- * - * optional .RogueScoreRewardInfo cur_score_reward_info = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableCurScoreRewardInfo() { - bitField0_ |= 0x00000040; - return curScoreRewardInfo; - } - - /** - * 
-     *  may be 5
-     *
- * - * optional .RogueScoreRewardInfo cur_score_reward_info = 2; - * @param value the curScoreRewardInfo to set - * @return this - */ - public RogueFinishInfo setCurScoreRewardInfo( - final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000040; - curScoreRewardInfo.copyFrom(value); - return this; - } - - /** - * 
-     *  may be 2
-     *
- * - * optional .RogueScoreRewardInfo score_reward_info = 5; - * @return whether the scoreRewardInfo field is set - */ - public boolean hasScoreRewardInfo() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * 
-     *  may be 2
-     *
- * - * optional .RogueScoreRewardInfo score_reward_info = 5; + * optional .RogueScoreRewardInfo score_reward_info = 9; * @return this */ public RogueFinishInfo clearScoreRewardInfo() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; scoreRewardInfo.clear(); return this; } /** * 
-     *  may be 2
+     *  may be 15
      *
* - * optional .RogueScoreRewardInfo score_reward_info = 5; + * optional .RogueScoreRewardInfo score_reward_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. @@ -467,10 +409,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  may be 2
+     *  may be 15
      *
* - * optional .RogueScoreRewardInfo score_reward_info = 5; + * optional .RogueScoreRewardInfo score_reward_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 @@ -479,46 +421,46 @@ public final class RogueFinishInfoOuterClass { * @return internal storage object for modifications */ public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableScoreRewardInfo() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return scoreRewardInfo; } /** * 
-     *  may be 2
+     *  may be 15
      *
* - * optional .RogueScoreRewardInfo score_reward_info = 5; + * optional .RogueScoreRewardInfo score_reward_info = 9; * @param value the scoreRewardInfo to set * @return this */ public RogueFinishInfo setScoreRewardInfo( final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; scoreRewardInfo.copyFrom(value); return this; } /** - * optional .RogueRecordInfo record_info = 14; + * optional .RogueRecordInfo record_info = 11; * @return whether the recordInfo field is set */ public boolean hasRecordInfo() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * optional .RogueRecordInfo record_info = 14; + * optional .RogueRecordInfo record_info = 11; * @return this */ public RogueFinishInfo clearRecordInfo() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; recordInfo.clear(); return this; } /** - * optional .RogueRecordInfo record_info = 14; + * optional .RogueRecordInfo record_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. @@ -532,7 +474,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional .RogueRecordInfo record_info = 14; + * optional .RogueRecordInfo record_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 @@ -541,35 +483,113 @@ public final class RogueFinishInfoOuterClass { * @return internal storage object for modifications */ public RogueRecordInfoOuterClass.RogueRecordInfo getMutableRecordInfo() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return recordInfo; } /** - * optional .RogueRecordInfo record_info = 14; + * optional .RogueRecordInfo record_info = 11; * @param value the recordInfo to set * @return this */ public RogueFinishInfo setRecordInfo(final RogueRecordInfoOuterClass.RogueRecordInfo value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; recordInfo.copyFrom(value); return this; } + /** + * 
+     *  may be 9
+     *
+ * + * optional .RogueScoreRewardInfo cur_score_reward_info = 15; + * @return whether the curScoreRewardInfo field is set + */ + public boolean hasCurScoreRewardInfo() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * 
+     *  may be 9
+     *
+ * + * optional .RogueScoreRewardInfo cur_score_reward_info = 15; + * @return this + */ + public RogueFinishInfo clearCurScoreRewardInfo() { + bitField0_ &= ~0x00000100; + curScoreRewardInfo.clear(); + return this; + } + + /** + * 
+     *  may be 9
+     *
+ * + * optional .RogueScoreRewardInfo cur_score_reward_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 #getMutableCurScoreRewardInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getCurScoreRewardInfo() { + return curScoreRewardInfo; + } + + /** + * 
+     *  may be 9
+     *
+ * + * optional .RogueScoreRewardInfo cur_score_reward_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 RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableCurScoreRewardInfo() { + bitField0_ |= 0x00000100; + return curScoreRewardInfo; + } + + /** + * 
+     *  may be 9
+     *
+ * + * optional .RogueScoreRewardInfo cur_score_reward_info = 15; + * @param value the curScoreRewardInfo to set + * @return this + */ + public RogueFinishInfo setCurScoreRewardInfo( + final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { + bitField0_ |= 0x00000100; + curScoreRewardInfo.copyFrom(value); + return this; + } + @Override public RogueFinishInfo copyFrom(final RogueFinishInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; passRoomCount = other.passRoomCount; - totalScore = other.totalScore; takenScore = other.takenScore; - areaId = other.areaId; + totalScore = other.totalScore; reachRoomCount = other.reachRoomCount; + areaId = other.areaId; isWin = other.isWin; - curScoreRewardInfo.copyFrom(other.curScoreRewardInfo); scoreRewardInfo.copyFrom(other.scoreRewardInfo); recordInfo.copyFrom(other.recordInfo); + curScoreRewardInfo.copyFrom(other.curScoreRewardInfo); } return this; } @@ -583,30 +603,30 @@ public final class RogueFinishInfoOuterClass { if (other.hasPassRoomCount()) { setPassRoomCount(other.passRoomCount); } - if (other.hasTotalScore()) { - setTotalScore(other.totalScore); - } if (other.hasTakenScore()) { setTakenScore(other.takenScore); } - if (other.hasAreaId()) { - setAreaId(other.areaId); + if (other.hasTotalScore()) { + setTotalScore(other.totalScore); } if (other.hasReachRoomCount()) { setReachRoomCount(other.reachRoomCount); } + if (other.hasAreaId()) { + setAreaId(other.areaId); + } if (other.hasIsWin()) { setIsWin(other.isWin); } - if (other.hasCurScoreRewardInfo()) { - getMutableCurScoreRewardInfo().mergeFrom(other.curScoreRewardInfo); - } if (other.hasScoreRewardInfo()) { getMutableScoreRewardInfo().mergeFrom(other.scoreRewardInfo); } if (other.hasRecordInfo()) { getMutableRecordInfo().mergeFrom(other.recordInfo); } + if (other.hasCurScoreRewardInfo()) { + getMutableCurScoreRewardInfo().mergeFrom(other.curScoreRewardInfo); + } return this; } @@ -618,14 +638,14 @@ public final class RogueFinishInfoOuterClass { cachedSize = -1; bitField0_ = 0; passRoomCount = 0; - totalScore = 0; takenScore = 0; - areaId = 0; + totalScore = 0; reachRoomCount = 0; + areaId = 0; isWin = false; - curScoreRewardInfo.clear(); scoreRewardInfo.clear(); recordInfo.clear(); + curScoreRewardInfo.clear(); return this; } @@ -636,9 +656,9 @@ public final class RogueFinishInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - curScoreRewardInfo.clearQuick(); scoreRewardInfo.clearQuick(); recordInfo.clearQuick(); + curScoreRewardInfo.clearQuick(); return this; } @@ -653,54 +673,54 @@ public final class RogueFinishInfoOuterClass { RogueFinishInfo other = (RogueFinishInfo) o; return bitField0_ == other.bitField0_ && (!hasPassRoomCount() || passRoomCount == other.passRoomCount) - && (!hasTotalScore() || totalScore == other.totalScore) && (!hasTakenScore() || takenScore == other.takenScore) - && (!hasAreaId() || areaId == other.areaId) + && (!hasTotalScore() || totalScore == other.totalScore) && (!hasReachRoomCount() || reachRoomCount == other.reachRoomCount) + && (!hasAreaId() || areaId == other.areaId) && (!hasIsWin() || isWin == other.isWin) - && (!hasCurScoreRewardInfo() || curScoreRewardInfo.equals(other.curScoreRewardInfo)) && (!hasScoreRewardInfo() || scoreRewardInfo.equals(other.scoreRewardInfo)) - && (!hasRecordInfo() || recordInfo.equals(other.recordInfo)); + && (!hasRecordInfo() || recordInfo.equals(other.recordInfo)) + && (!hasCurScoreRewardInfo() || curScoreRewardInfo.equals(other.curScoreRewardInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(passRoomCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(totalScore); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(takenScore); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 18136); - output.writeUInt32NoTag(areaId); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(totalScore); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 29136); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawLittleEndian16((short) 8160); output.writeUInt32NoTag(reachRoomCount); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawLittleEndian16((short) 13784); + output.writeUInt32NoTag(areaId); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(curScoreRewardInfo); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 74); output.writeMessageNoTag(scoreRewardInfo); } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 114); + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 90); output.writeMessageNoTag(recordInfo); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(curScoreRewardInfo); + } } @Override @@ -710,29 +730,29 @@ public final class RogueFinishInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(passRoomCount); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(totalScore); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(takenScore); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(totalScore); + } if ((bitField0_ & 0x00000008) != 0) { - size += 2 + ProtoSink.computeUInt32SizeNoTag(areaId); + size += 2 + ProtoSink.computeUInt32SizeNoTag(reachRoomCount); } if ((bitField0_ & 0x00000010) != 0) { - size += 2 + ProtoSink.computeUInt32SizeNoTag(reachRoomCount); + size += 2 + ProtoSink.computeUInt32SizeNoTag(areaId); } if ((bitField0_ & 0x00000020) != 0) { size += 2; } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(curScoreRewardInfo); - } - if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(scoreRewardInfo); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo); } + if ((bitField0_ & 0x00000100) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(curScoreRewardInfo); + } return size; } @@ -743,81 +763,81 @@ public final class RogueFinishInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // passRoomCount passRoomCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // totalScore - totalScore = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // takenScore - takenScore = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 9048) { - break; - } - } - case 9048: { - // areaId - areaId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 14544) { - break; - } - } - case 14544: { - // reachRoomCount - reachRoomCount = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 32) { break; } } case 32: { + // takenScore + takenScore = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // totalScore + totalScore = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 4064) { + break; + } + } + case 4064: { + // reachRoomCount + reachRoomCount = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 6872) { + break; + } + } + case 6872: { + // areaId + areaId = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // isWin isWin = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 18) { + if (tag != 74) { break; } } - case 18: { - // curScoreRewardInfo - input.readMessage(curScoreRewardInfo); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { + case 74: { // scoreRewardInfo input.readMessage(scoreRewardInfo); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // recordInfo input.readMessage(recordInfo); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // curScoreRewardInfo + input.readMessage(curScoreRewardInfo); bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 0) { @@ -845,29 +865,29 @@ public final class RogueFinishInfoOuterClass { output.writeUInt32(FieldNames.passRoomCount, passRoomCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.totalScore, totalScore); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.takenScore, takenScore); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.totalScore, totalScore); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); + output.writeUInt32(FieldNames.reachRoomCount, reachRoomCount); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.reachRoomCount, reachRoomCount); + output.writeUInt32(FieldNames.areaId, areaId); } if ((bitField0_ & 0x00000020) != 0) { output.writeBool(FieldNames.isWin, isWin); } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.curScoreRewardInfo, curScoreRewardInfo); - } - if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.scoreRewardInfo, scoreRewardInfo); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.recordInfo, recordInfo); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeMessage(FieldNames.curScoreRewardInfo, curScoreRewardInfo); + } output.endObject(); } @@ -890,11 +910,11 @@ public final class RogueFinishInfoOuterClass { } break; } - case -716972626: - case -393348649: { - if (input.isAtField(FieldNames.totalScore)) { + case -375532021: + case 1601375514: { + if (input.isAtField(FieldNames.takenScore)) { if (!input.trySkipNullValue()) { - totalScore = input.readUInt32(); + takenScore = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -902,11 +922,11 @@ public final class RogueFinishInfoOuterClass { } break; } - case -375532021: - case 1601375514: { - if (input.isAtField(FieldNames.takenScore)) { + case -716972626: + case -393348649: { + if (input.isAtField(FieldNames.totalScore)) { if (!input.trySkipNullValue()) { - takenScore = input.readUInt32(); + totalScore = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -914,23 +934,23 @@ public final class RogueFinishInfoOuterClass { } break; } - case -1409553784: - case -746472947: { - if (input.isAtField(FieldNames.areaId)) { - if (!input.trySkipNullValue()) { - areaId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -1588434751: case 1678904055: { if (input.isAtField(FieldNames.reachRoomCount)) { if (!input.trySkipNullValue()) { reachRoomCount = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1409553784: + case -746472947: { + if (input.isAtField(FieldNames.areaId)) { + if (!input.trySkipNullValue()) { + areaId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -950,24 +970,12 @@ public final class RogueFinishInfoOuterClass { } break; } - case 1101722191: - case 1894162770: { - if (input.isAtField(FieldNames.curScoreRewardInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(curScoreRewardInfo); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } case 672564399: case 751191441: { if (input.isAtField(FieldNames.scoreRewardInfo)) { if (!input.trySkipNullValue()) { input.readMessage(scoreRewardInfo); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -979,6 +987,18 @@ public final class RogueFinishInfoOuterClass { if (input.isAtField(FieldNames.recordInfo)) { if (!input.trySkipNullValue()) { input.readMessage(recordInfo); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1101722191: + case 1894162770: { + if (input.isAtField(FieldNames.curScoreRewardInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(curScoreRewardInfo); bitField0_ |= 0x00000100; } } else { @@ -1041,21 +1061,21 @@ public final class RogueFinishInfoOuterClass { static class FieldNames { static final FieldName passRoomCount = FieldName.forField("passRoomCount", "pass_room_count"); - static final FieldName totalScore = FieldName.forField("totalScore", "total_score"); - static final FieldName takenScore = FieldName.forField("takenScore", "taken_score"); - static final FieldName areaId = FieldName.forField("areaId", "area_id"); + static final FieldName totalScore = FieldName.forField("totalScore", "total_score"); static final FieldName reachRoomCount = FieldName.forField("reachRoomCount", "reach_room_count"); - static final FieldName isWin = FieldName.forField("isWin", "is_win"); + static final FieldName areaId = FieldName.forField("areaId", "area_id"); - static final FieldName curScoreRewardInfo = FieldName.forField("curScoreRewardInfo", "cur_score_reward_info"); + static final FieldName isWin = FieldName.forField("isWin", "is_win"); static final FieldName scoreRewardInfo = FieldName.forField("scoreRewardInfo", "score_reward_info"); static final FieldName recordInfo = FieldName.forField("recordInfo", "record_info"); + + static final FieldName curScoreRewardInfo = FieldName.forField("curScoreRewardInfo", "cur_score_reward_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java index ee3cde6..0942f45 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 max_level = 5; - */ - private int maxLevel; - - /** - * optional uint32 level = 8; - */ - private int level; - - /** - * optional uint32 aeon_id = 12; - */ - private int aeonId; - - /** - * optional uint32 exp = 13; + * optional uint32 exp = 1; */ private int exp; + /** + * optional uint32 level = 2; + */ + private int level; + + /** + * optional uint32 max_level = 3; + */ + private int maxLevel; + + /** + * optional uint32 aeon_id = 4; + */ + private int aeonId; + /** * 
-     *  FODOAOKIBLG
+     *  CPKMMHENJOF
      *
* - * repeated uint32 archive_unlock_list = 2; + * repeated uint32 archive_unlock_list = 9; */ private final RepeatedInt archiveUnlockList = RepeatedInt.newEmptyInstance(); /** * 
-     *  NJFMOEKGAHN
+     *  JKONPKKIALG
      *
* - * repeated uint32 taken_reward_list = 15; + * repeated uint32 taken_reward_list = 11; */ private final RepeatedInt takenRewardList = RepeatedInt.newEmptyInstance(); @@ -68,44 +68,44 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 max_level = 5; - * @return whether the maxLevel field is set + * optional uint32 exp = 1; + * @return whether the exp field is set */ - public boolean hasMaxLevel() { + public boolean hasExp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 max_level = 5; + * optional uint32 exp = 1; * @return this */ - public RogueHandbookAeon clearMaxLevel() { + public RogueHandbookAeon clearExp() { bitField0_ &= ~0x00000001; - maxLevel = 0; + exp = 0; return this; } /** - * optional uint32 max_level = 5; - * @return the maxLevel + * optional uint32 exp = 1; + * @return the exp */ - public int getMaxLevel() { - return maxLevel; + public int getExp() { + return exp; } /** - * optional uint32 max_level = 5; - * @param value the maxLevel to set + * optional uint32 exp = 1; + * @param value the exp to set * @return this */ - public RogueHandbookAeon setMaxLevel(final int value) { + public RogueHandbookAeon setExp(final int value) { bitField0_ |= 0x00000001; - maxLevel = value; + exp = value; return this; } /** - * optional uint32 level = 8; + * optional uint32 level = 2; * @return whether the level field is set */ public boolean hasLevel() { @@ -113,7 +113,7 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 2; * @return this */ public RogueHandbookAeon clearLevel() { @@ -123,7 +123,7 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 2; * @return the level */ public int getLevel() { @@ -131,7 +131,7 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 2; * @param value the level to set * @return this */ @@ -142,25 +142,62 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 aeon_id = 12; - * @return whether the aeonId field is set + * optional uint32 max_level = 3; + * @return whether the maxLevel field is set */ - public boolean hasAeonId() { + public boolean hasMaxLevel() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 aeon_id = 12; + * optional uint32 max_level = 3; + * @return this + */ + public RogueHandbookAeon clearMaxLevel() { + bitField0_ &= ~0x00000004; + maxLevel = 0; + return this; + } + + /** + * optional uint32 max_level = 3; + * @return the maxLevel + */ + public int getMaxLevel() { + return maxLevel; + } + + /** + * optional uint32 max_level = 3; + * @param value the maxLevel to set + * @return this + */ + public RogueHandbookAeon setMaxLevel(final int value) { + bitField0_ |= 0x00000004; + maxLevel = value; + return this; + } + + /** + * optional uint32 aeon_id = 4; + * @return whether the aeonId field is set + */ + public boolean hasAeonId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 aeon_id = 4; * @return this */ public RogueHandbookAeon clearAeonId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; aeonId = 0; return this; } /** - * optional uint32 aeon_id = 12; + * optional uint32 aeon_id = 4; * @return the aeonId */ public int getAeonId() { @@ -168,59 +205,22 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 aeon_id = 12; + * optional uint32 aeon_id = 4; * @param value the aeonId to set * @return this */ public RogueHandbookAeon setAeonId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; 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; - } - /** * 
-     *  FODOAOKIBLG
+     *  CPKMMHENJOF
      *
* - * repeated uint32 archive_unlock_list = 2; + * repeated uint32 archive_unlock_list = 9; * @return whether the archiveUnlockList field is set */ public boolean hasArchiveUnlockList() { @@ -229,10 +229,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  FODOAOKIBLG
+     *  CPKMMHENJOF
      *
* - * repeated uint32 archive_unlock_list = 2; + * repeated uint32 archive_unlock_list = 9; * @return this */ public RogueHandbookAeon clearArchiveUnlockList() { @@ -243,10 +243,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  FODOAOKIBLG
+     *  CPKMMHENJOF
      *
* - * repeated uint32 archive_unlock_list = 2; + * repeated uint32 archive_unlock_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. @@ -261,10 +261,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  FODOAOKIBLG
+     *  CPKMMHENJOF
      *
* - * repeated uint32 archive_unlock_list = 2; + * repeated uint32 archive_unlock_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 @@ -279,10 +279,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  FODOAOKIBLG
+     *  CPKMMHENJOF
      *
* - * repeated uint32 archive_unlock_list = 2; + * repeated uint32 archive_unlock_list = 9; * @param value the archiveUnlockList to add * @return this */ @@ -294,10 +294,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  FODOAOKIBLG
+     *  CPKMMHENJOF
      *
* - * repeated uint32 archive_unlock_list = 2; + * repeated uint32 archive_unlock_list = 9; * @param values the archiveUnlockList to add * @return this */ @@ -309,10 +309,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  NJFMOEKGAHN
+     *  JKONPKKIALG
      *
* - * repeated uint32 taken_reward_list = 15; + * repeated uint32 taken_reward_list = 11; * @return whether the takenRewardList field is set */ public boolean hasTakenRewardList() { @@ -321,10 +321,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  NJFMOEKGAHN
+     *  JKONPKKIALG
      *
* - * repeated uint32 taken_reward_list = 15; + * repeated uint32 taken_reward_list = 11; * @return this */ public RogueHandbookAeon clearTakenRewardList() { @@ -335,10 +335,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  NJFMOEKGAHN
+     *  JKONPKKIALG
      *
* - * repeated uint32 taken_reward_list = 15; + * repeated uint32 taken_reward_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. @@ -353,10 +353,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  NJFMOEKGAHN
+     *  JKONPKKIALG
      *
* - * repeated uint32 taken_reward_list = 15; + * repeated uint32 taken_reward_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 @@ -371,10 +371,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  NJFMOEKGAHN
+     *  JKONPKKIALG
      *
* - * repeated uint32 taken_reward_list = 15; + * repeated uint32 taken_reward_list = 11; * @param value the takenRewardList to add * @return this */ @@ -386,10 +386,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  NJFMOEKGAHN
+     *  JKONPKKIALG
      *
* - * repeated uint32 taken_reward_list = 15; + * repeated uint32 taken_reward_list = 11; * @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_; - maxLevel = other.maxLevel; - level = other.level; - aeonId = other.aeonId; exp = other.exp; + level = other.level; + maxLevel = other.maxLevel; + aeonId = other.aeonId; archiveUnlockList.copyFrom(other.archiveUnlockList); takenRewardList.copyFrom(other.takenRewardList); } @@ -420,18 +420,18 @@ public final class RogueHandbookAeonOuterClass { return this; } cachedSize = -1; - if (other.hasMaxLevel()) { - setMaxLevel(other.maxLevel); + if (other.hasExp()) { + setExp(other.exp); } if (other.hasLevel()) { setLevel(other.level); } + if (other.hasMaxLevel()) { + setMaxLevel(other.maxLevel); + } 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; - maxLevel = 0; - level = 0; - aeonId = 0; exp = 0; + level = 0; + maxLevel = 0; + aeonId = 0; archiveUnlockList.clear(); takenRewardList.clear(); return this; @@ -479,10 +479,10 @@ public final class RogueHandbookAeonOuterClass { } RogueHandbookAeon other = (RogueHandbookAeon) o; return bitField0_ == other.bitField0_ - && (!hasMaxLevel() || maxLevel == other.maxLevel) - && (!hasLevel() || level == other.level) - && (!hasAeonId() || aeonId == other.aeonId) && (!hasExp() || exp == other.exp) + && (!hasLevel() || level == other.level) + && (!hasMaxLevel() || maxLevel == other.maxLevel) + && (!hasAeonId() || aeonId == other.aeonId) && (!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) 40); - output.writeUInt32NoTag(maxLevel); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(aeonId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(maxLevel); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(aeonId); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < archiveUnlockList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(archiveUnlockList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < takenRewardList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(takenRewardList.array()[i]); } } @@ -523,16 +523,16 @@ public final class RogueHandbookAeonOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxLevel); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * archiveUnlockList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveUnlockList); @@ -550,52 +550,52 @@ public final class RogueHandbookAeonOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // maxLevel - maxLevel = input.readUInt32(); + case 8: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 16) { break; } } - case 64: { + case 16: { // level level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 24) { break; } } - case 96: { - // aeonId - aeonId = input.readUInt32(); + case 24: { + // maxLevel + maxLevel = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 32) { break; } } - case 104: { - // exp - exp = input.readUInt32(); + case 32: { + // aeonId + aeonId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { + if (tag != 74) { break; } } - case 18: { + case 74: { // archiveUnlockList [packed=true] input.readPackedUInt32(archiveUnlockList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 122) { + if (tag != 90) { break; } } - case 122: { + case 90: { // takenRewardList [packed=true] input.readPackedUInt32(takenRewardList, tag); bitField0_ |= 0x00000020; @@ -614,13 +614,13 @@ public final class RogueHandbookAeonOuterClass { tag = input.readTag(); break; } - case 16: { + case 72: { // archiveUnlockList [packed=false] tag = input.readRepeatedUInt32(archiveUnlockList, tag); bitField0_ |= 0x00000010; break; } - case 120: { + case 88: { // takenRewardList [packed=false] tag = input.readRepeatedUInt32(takenRewardList, tag); bitField0_ |= 0x00000020; @@ -634,16 +634,16 @@ public final class RogueHandbookAeonOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.maxLevel, maxLevel); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.aeonId, aeonId); + output.writeUInt32(FieldNames.maxLevel, maxLevel); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.aeonId, aeonId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.archiveUnlockList, archiveUnlockList); @@ -661,11 +661,10 @@ public final class RogueHandbookAeonOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 390120576: - case -241235735: { - if (input.isAtField(FieldNames.maxLevel)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - maxLevel = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -684,11 +683,11 @@ public final class RogueHandbookAeonOuterClass { } break; } - case -1421249154: - case -1109029417: { - if (input.isAtField(FieldNames.aeonId)) { + case 390120576: + case -241235735: { + if (input.isAtField(FieldNames.maxLevel)) { if (!input.trySkipNullValue()) { - aeonId = input.readUInt32(); + maxLevel = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -696,10 +695,11 @@ public final class RogueHandbookAeonOuterClass { } break; } - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case -1421249154: + case -1109029417: { + if (input.isAtField(FieldNames.aeonId)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + aeonId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -784,13 +784,13 @@ public final class RogueHandbookAeonOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName maxLevel = FieldName.forField("maxLevel", "max_level"); + static final FieldName exp = FieldName.forField("exp"); static final FieldName level = FieldName.forField("level"); - static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); + static final FieldName maxLevel = FieldName.forField("maxLevel", "max_level"); - static final FieldName exp = FieldName.forField("exp"); + static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); static final FieldName archiveUnlockList = FieldName.forField("archiveUnlockList", "archive_unlock_list"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java index 64952b3..adddd29 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 = 15; + * optional uint32 buff_id = 4; */ private int buffId; @@ -34,7 +34,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -42,7 +42,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; * @return this */ public RogueHandbookBuff clearBuffId() { @@ -52,7 +52,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; * @return the buffId */ public int getBuffId() { @@ -60,7 +60,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; * @param value the buffId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueHandbookBuffOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(buffId); } } @@ -150,7 +150,7 @@ public final class RogueHandbookBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java index 4b10bf6..5249989 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java @@ -20,22 +20,22 @@ public final class RogueHandbookDataOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueHandbookMiracle miracle_list = 3; + * repeated .RogueHandbookMiracle miracle_list = 2; */ private final RepeatedMessage miracleList = RepeatedMessage.newEmptyInstance(RogueHandbookMiracleOuterClass.RogueHandbookMiracle.getFactory()); /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; - */ - private final RepeatedMessage rogueAeonList = RepeatedMessage.newEmptyInstance(RogueHandbookAeonOuterClass.RogueHandbookAeon.getFactory()); - - /** - * repeated .RogueHandbookBuff buff_list = 10; + * repeated .RogueHandbookBuff buff_list = 5; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(RogueHandbookBuffOuterClass.RogueHandbookBuff.getFactory()); /** - * repeated .RogueHandbookEvent rogue_event = 12; + * repeated .RogueHandbookAeon rogue_aeon_list = 10; + */ + private final RepeatedMessage rogueAeonList = RepeatedMessage.newEmptyInstance(RogueHandbookAeonOuterClass.RogueHandbookAeon.getFactory()); + + /** + * repeated .RogueHandbookEvent rogue_event = 14; */ private final RepeatedMessage rogueEvent = RepeatedMessage.newEmptyInstance(RogueHandbookEventOuterClass.RogueHandbookEvent.getFactory()); @@ -50,7 +50,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookMiracle miracle_list = 3; + * repeated .RogueHandbookMiracle miracle_list = 2; * @return whether the miracleList field is set */ public boolean hasMiracleList() { @@ -58,7 +58,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookMiracle miracle_list = 3; + * repeated .RogueHandbookMiracle miracle_list = 2; * @return this */ public RogueHandbookData clearMiracleList() { @@ -68,7 +68,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookMiracle miracle_list = 3; + * repeated .RogueHandbookMiracle miracle_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. @@ -82,7 +82,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookMiracle miracle_list = 3; + * repeated .RogueHandbookMiracle miracle_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 @@ -97,7 +97,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookMiracle miracle_list = 3; + * repeated .RogueHandbookMiracle miracle_list = 2; * @param value the miracleList to add * @return this */ @@ -109,7 +109,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookMiracle miracle_list = 3; + * repeated .RogueHandbookMiracle miracle_list = 2; * @param values the miracleList to add * @return this */ @@ -121,96 +121,25 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; - * @return whether the rogueAeonList field is set + * repeated .RogueHandbookBuff buff_list = 5; + * @return whether the buffList field is set */ - public boolean hasRogueAeonList() { + public boolean hasBuffList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; - * @return this - */ - public RogueHandbookData clearRogueAeonList() { - bitField0_ &= ~0x00000002; - rogueAeonList.clear(); - return this; - } - - /** - * repeated .RogueHandbookAeon rogue_aeon_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 #getMutableRogueAeonList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getRogueAeonList() { - return rogueAeonList; - } - - /** - * repeated .RogueHandbookAeon rogue_aeon_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 getMutableRogueAeonList( - ) { - bitField0_ |= 0x00000002; - return rogueAeonList; - } - - /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; - * @param value the rogueAeonList to add - * @return this - */ - public RogueHandbookData addRogueAeonList( - final RogueHandbookAeonOuterClass.RogueHandbookAeon value) { - bitField0_ |= 0x00000002; - rogueAeonList.add(value); - return this; - } - - /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; - * @param values the rogueAeonList to add - * @return this - */ - public RogueHandbookData addAllRogueAeonList( - final RogueHandbookAeonOuterClass.RogueHandbookAeon... values) { - bitField0_ |= 0x00000002; - rogueAeonList.addAll(values); - 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; + * repeated .RogueHandbookBuff buff_list = 5; * @return this */ public RogueHandbookData clearBuffList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; buffList.clear(); return this; } /** - * repeated .RogueHandbookBuff buff_list = 10; + * repeated .RogueHandbookBuff 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. @@ -224,7 +153,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookBuff buff_list = 10; + * repeated .RogueHandbookBuff 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 @@ -233,36 +162,107 @@ public final class RogueHandbookDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableBuffList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return buffList; } /** - * repeated .RogueHandbookBuff buff_list = 10; + * repeated .RogueHandbookBuff buff_list = 5; * @param value the buffList to add * @return this */ public RogueHandbookData addBuffList( final RogueHandbookBuffOuterClass.RogueHandbookBuff value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; buffList.add(value); return this; } /** - * repeated .RogueHandbookBuff buff_list = 10; + * repeated .RogueHandbookBuff buff_list = 5; * @param values the buffList to add * @return this */ public RogueHandbookData addAllBuffList( final RogueHandbookBuffOuterClass.RogueHandbookBuff... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; buffList.addAll(values); return this; } /** - * repeated .RogueHandbookEvent rogue_event = 12; + * repeated .RogueHandbookAeon rogue_aeon_list = 10; + * @return whether the rogueAeonList field is set + */ + public boolean hasRogueAeonList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 10; + * @return this + */ + public RogueHandbookData clearRogueAeonList() { + bitField0_ &= ~0x00000004; + rogueAeonList.clear(); + return this; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_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 #getMutableRogueAeonList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getRogueAeonList() { + return rogueAeonList; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_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 getMutableRogueAeonList( + ) { + bitField0_ |= 0x00000004; + return rogueAeonList; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 10; + * @param value the rogueAeonList to add + * @return this + */ + public RogueHandbookData addRogueAeonList( + final RogueHandbookAeonOuterClass.RogueHandbookAeon value) { + bitField0_ |= 0x00000004; + rogueAeonList.add(value); + return this; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 10; + * @param values the rogueAeonList to add + * @return this + */ + public RogueHandbookData addAllRogueAeonList( + final RogueHandbookAeonOuterClass.RogueHandbookAeon... values) { + bitField0_ |= 0x00000004; + rogueAeonList.addAll(values); + return this; + } + + /** + * repeated .RogueHandbookEvent rogue_event = 14; * @return whether the rogueEvent field is set */ public boolean hasRogueEvent() { @@ -270,7 +270,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookEvent rogue_event = 12; + * repeated .RogueHandbookEvent rogue_event = 14; * @return this */ public RogueHandbookData clearRogueEvent() { @@ -280,7 +280,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookEvent rogue_event = 12; + * repeated .RogueHandbookEvent rogue_event = 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. @@ -294,7 +294,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookEvent rogue_event = 12; + * repeated .RogueHandbookEvent rogue_event = 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 @@ -308,7 +308,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookEvent rogue_event = 12; + * repeated .RogueHandbookEvent rogue_event = 14; * @param value the rogueEvent to add * @return this */ @@ -320,7 +320,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookEvent rogue_event = 12; + * repeated .RogueHandbookEvent rogue_event = 14; * @param values the rogueEvent to add * @return this */ @@ -337,8 +337,8 @@ public final class RogueHandbookDataOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; miracleList.copyFrom(other.miracleList); - rogueAeonList.copyFrom(other.rogueAeonList); buffList.copyFrom(other.buffList); + rogueAeonList.copyFrom(other.rogueAeonList); rogueEvent.copyFrom(other.rogueEvent); } return this; @@ -353,12 +353,12 @@ public final class RogueHandbookDataOuterClass { if (other.hasMiracleList()) { getMutableMiracleList().addAll(other.miracleList); } - if (other.hasRogueAeonList()) { - getMutableRogueAeonList().addAll(other.rogueAeonList); - } if (other.hasBuffList()) { getMutableBuffList().addAll(other.buffList); } + if (other.hasRogueAeonList()) { + getMutableRogueAeonList().addAll(other.rogueAeonList); + } if (other.hasRogueEvent()) { getMutableRogueEvent().addAll(other.rogueEvent); } @@ -373,8 +373,8 @@ public final class RogueHandbookDataOuterClass { cachedSize = -1; bitField0_ = 0; miracleList.clear(); - rogueAeonList.clear(); buffList.clear(); + rogueAeonList.clear(); rogueEvent.clear(); return this; } @@ -387,8 +387,8 @@ public final class RogueHandbookDataOuterClass { cachedSize = -1; bitField0_ = 0; miracleList.clearQuick(); - rogueAeonList.clearQuick(); buffList.clearQuick(); + rogueAeonList.clearQuick(); rogueEvent.clearQuick(); return this; } @@ -404,8 +404,8 @@ public final class RogueHandbookDataOuterClass { RogueHandbookData other = (RogueHandbookData) o; return bitField0_ == other.bitField0_ && (!hasMiracleList() || miracleList.equals(other.miracleList)) - && (!hasRogueAeonList() || rogueAeonList.equals(other.rogueAeonList)) && (!hasBuffList() || buffList.equals(other.buffList)) + && (!hasRogueAeonList() || rogueAeonList.equals(other.rogueAeonList)) && (!hasRogueEvent() || rogueEvent.equals(other.rogueEvent)); } @@ -413,25 +413,25 @@ public final class RogueHandbookDataOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < miracleList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 18); output.writeMessageNoTag(miracleList.get(i)); } } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < rogueAeonList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(rogueAeonList.get(i)); + for (int i = 0; i < buffList.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(buffList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < buffList.length(); i++) { + for (int i = 0; i < rogueAeonList.length(); i++) { output.writeRawByte((byte) 82); - output.writeMessageNoTag(buffList.get(i)); + output.writeMessageNoTag(rogueAeonList.get(i)); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < rogueEvent.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 114); output.writeMessageNoTag(rogueEvent.get(i)); } } @@ -444,10 +444,10 @@ public final class RogueHandbookDataOuterClass { size += (1 * miracleList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(miracleList); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * rogueAeonList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueAeonList); + size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); + size += (1 * rogueAeonList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueAeonList); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * rogueEvent.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueEvent); @@ -462,31 +462,31 @@ public final class RogueHandbookDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 18: { // miracleList tag = input.readRepeatedMessage(miracleList, tag); bitField0_ |= 0x00000001; - if (tag != 74) { + if (tag != 42) { break; } } - case 74: { - // rogueAeonList - tag = input.readRepeatedMessage(rogueAeonList, tag); + case 42: { + // buffList + tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000002; if (tag != 82) { break; } } case 82: { - // buffList - tag = input.readRepeatedMessage(buffList, tag); + // rogueAeonList + tag = input.readRepeatedMessage(rogueAeonList, tag); bitField0_ |= 0x00000004; - if (tag != 98) { + if (tag != 114) { break; } } - case 98: { + case 114: { // rogueEvent tag = input.readRepeatedMessage(rogueEvent, tag); bitField0_ |= 0x00000008; @@ -515,10 +515,10 @@ public final class RogueHandbookDataOuterClass { output.writeRepeatedMessage(FieldNames.miracleList, miracleList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.rogueAeonList, rogueAeonList); + output.writeRepeatedMessage(FieldNames.buffList, buffList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.buffList, buffList); + output.writeRepeatedMessage(FieldNames.rogueAeonList, rogueAeonList); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.rogueEvent, rogueEvent); @@ -545,11 +545,11 @@ public final class RogueHandbookDataOuterClass { } break; } - case -1684933573: - case -1375837643: { - if (input.isAtField(FieldNames.rogueAeonList)) { + case -1522789487: + case 55792906: { + if (input.isAtField(FieldNames.buffList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(rogueAeonList); + input.readRepeatedMessage(buffList); bitField0_ |= 0x00000002; } } else { @@ -557,11 +557,11 @@ public final class RogueHandbookDataOuterClass { } break; } - case -1522789487: - case 55792906: { - if (input.isAtField(FieldNames.buffList)) { + case -1684933573: + case -1375837643: { + if (input.isAtField(FieldNames.rogueAeonList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(buffList); + input.readRepeatedMessage(rogueAeonList); bitField0_ |= 0x00000004; } } else { @@ -636,10 +636,10 @@ public final class RogueHandbookDataOuterClass { static class FieldNames { static final FieldName miracleList = FieldName.forField("miracleList", "miracle_list"); - static final FieldName rogueAeonList = FieldName.forField("rogueAeonList", "rogue_aeon_list"); - static final FieldName buffList = FieldName.forField("buffList", "buff_list"); + static final FieldName rogueAeonList = FieldName.forField("rogueAeonList", "rogue_aeon_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 3886d17..fb41e31 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java @@ -19,12 +19,12 @@ public final class RogueHandbookEventOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_id = 15; + * optional uint32 event_id = 14; */ private int eventId; /** - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 6; */ private boolean isUnlocked; @@ -39,7 +39,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 15; + * optional uint32 event_id = 14; * @return whether the eventId field is set */ public boolean hasEventId() { @@ -47,7 +47,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 15; + * optional uint32 event_id = 14; * @return this */ public RogueHandbookEvent clearEventId() { @@ -57,7 +57,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 15; + * optional uint32 event_id = 14; * @return the eventId */ public int getEventId() { @@ -65,7 +65,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 15; + * optional uint32 event_id = 14; * @param value the eventId to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 6; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -84,7 +84,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 6; * @return this */ public RogueHandbookEvent clearIsUnlocked() { @@ -94,7 +94,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 6; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -102,7 +102,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 6; * @param value the isUnlocked to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueHandbookEventOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isUnlocked); } } @@ -205,16 +205,16 @@ public final class RogueHandbookEventOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 112: { // eventId eventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 48) { break; } } - case 8: { + case 48: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java index 8c8bb3f..12b9ae8 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java @@ -19,7 +19,7 @@ public final class RogueHandbookMiracleOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 miracle_id = 2; + * optional uint32 miracle_id = 11; */ private int miracleId; @@ -39,7 +39,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 2; + * optional uint32 miracle_id = 11; * @return whether the miracleId field is set */ public boolean hasMiracleId() { @@ -47,7 +47,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 2; + * optional uint32 miracle_id = 11; * @return this */ public RogueHandbookMiracle clearMiracleId() { @@ -57,7 +57,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 2; + * optional uint32 miracle_id = 11; * @return the miracleId */ public int getMiracleId() { @@ -65,7 +65,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 2; + * optional uint32 miracle_id = 11; * @param value the miracleId to set * @return this */ @@ -177,7 +177,7 @@ public final class RogueHandbookMiracleOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(miracleId); } if ((bitField0_ & 0x00000002) != 0) { @@ -205,7 +205,7 @@ public final class RogueHandbookMiracleOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 88: { // miracleId miracleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java index 085ae77..8c4477b 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 .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; + * optional .RogueAreaInfo rogue_area_info = 2; */ - private final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo rogueVirtualItemInfo = RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo.newInstance(); + private final RogueAreaInfoOuterClass.RogueAreaInfo rogueAreaInfo = RogueAreaInfoOuterClass.RogueAreaInfo.newInstance(); /** - * optional .RogueAeonInfo rogue_aeon_info = 3; - */ - private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); - - /** - * optional .RogueSeasonInfo rogue_season_info = 5; - */ - private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance(); - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; + * optional .RogueScoreRewardInfo rogue_score_info = 3; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); /** - * optional .RogueAreaInfo rogue_area_info = 12; + * optional .RogueAeonInfo rogue_aeon_info = 10; */ - private final RogueAreaInfoOuterClass.RogueAreaInfo rogueAreaInfo = RogueAreaInfoOuterClass.RogueAreaInfo.newInstance(); + private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); + + /** + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + */ + private final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo rogueVirtualItemInfo = RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo.newInstance(); + + /** + * optional .RogueSeasonInfo rogue_season_info = 14; + */ + private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance(); private RogueInfoData() { } @@ -54,256 +54,25 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; - * @return whether the rogueVirtualItemInfo field is set + * optional .RogueAreaInfo rogue_area_info = 2; + * @return whether the rogueAreaInfo field is set */ - public boolean hasRogueVirtualItemInfo() { + public boolean hasRogueAreaInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; - * @return this - */ - public RogueInfoData clearRogueVirtualItemInfo() { - bitField0_ &= ~0x00000001; - rogueVirtualItemInfo.clear(); - return this; - } - - /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueVirtualItemInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getRogueVirtualItemInfo() { - return rogueVirtualItemInfo; - } - - /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getMutableRogueVirtualItemInfo( - ) { - bitField0_ |= 0x00000001; - return rogueVirtualItemInfo; - } - - /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; - * @param value the rogueVirtualItemInfo to set - * @return this - */ - public RogueInfoData setRogueVirtualItemInfo( - final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo value) { - bitField0_ |= 0x00000001; - rogueVirtualItemInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 3; - * @return whether the rogueAeonInfo field is set - */ - public boolean hasRogueAeonInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 3; - * @return this - */ - public RogueInfoData clearRogueAeonInfo() { - bitField0_ &= ~0x00000002; - rogueAeonInfo.clear(); - return this; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 3; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * 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 = 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 RogueAeonInfoOuterClass.RogueAeonInfo getMutableRogueAeonInfo() { - bitField0_ |= 0x00000002; - return rogueAeonInfo; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 3; - * @param value the rogueAeonInfo to set - * @return this - */ - public RogueInfoData setRogueAeonInfo(final RogueAeonInfoOuterClass.RogueAeonInfo value) { - bitField0_ |= 0x00000002; - rogueAeonInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 5; - * @return whether the rogueSeasonInfo field is set - */ - public boolean hasRogueSeasonInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 5; - * @return this - */ - public RogueInfoData clearRogueSeasonInfo() { - bitField0_ &= ~0x00000004; - rogueSeasonInfo.clear(); - return this; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 5; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueSeasonInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() { - return rogueSeasonInfo; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 5; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() { - bitField0_ |= 0x00000004; - return rogueSeasonInfo; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 5; - * @param value the rogueSeasonInfo to set - * @return this - */ - public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) { - bitField0_ |= 0x00000004; - rogueSeasonInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; - * @return whether the rogueScoreInfo field is set - */ - public boolean hasRogueScoreInfo() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; - * @return this - */ - public RogueInfoData clearRogueScoreInfo() { - bitField0_ &= ~0x00000008; - rogueScoreInfo.clear(); - return this; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueScoreInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getRogueScoreInfo() { - return rogueScoreInfo; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableRogueScoreInfo() { - bitField0_ |= 0x00000008; - return rogueScoreInfo; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; - * @param value the rogueScoreInfo to set - * @return this - */ - public RogueInfoData setRogueScoreInfo( - final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000008; - rogueScoreInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 12; - * @return whether the rogueAreaInfo field is set - */ - public boolean hasRogueAreaInfo() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 12; + * optional .RogueAreaInfo rogue_area_info = 2; * @return this */ public RogueInfoData clearRogueAreaInfo() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000001; rogueAreaInfo.clear(); return this; } /** - * optional .RogueAreaInfo rogue_area_info = 12; + * optional .RogueAreaInfo rogue_area_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. @@ -317,7 +86,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueAreaInfo rogue_area_info = 12; + * optional .RogueAreaInfo rogue_area_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 @@ -326,31 +95,262 @@ public final class RogueInfoDataOuterClass { * @return internal storage object for modifications */ public RogueAreaInfoOuterClass.RogueAreaInfo getMutableRogueAreaInfo() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000001; return rogueAreaInfo; } /** - * optional .RogueAreaInfo rogue_area_info = 12; + * optional .RogueAreaInfo rogue_area_info = 2; * @param value the rogueAreaInfo to set * @return this */ public RogueInfoData setRogueAreaInfo(final RogueAreaInfoOuterClass.RogueAreaInfo value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000001; rogueAreaInfo.copyFrom(value); return this; } + /** + * optional .RogueScoreRewardInfo rogue_score_info = 3; + * @return whether the rogueScoreInfo field is set + */ + public boolean hasRogueScoreInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 3; + * @return this + */ + public RogueInfoData clearRogueScoreInfo() { + bitField0_ &= ~0x00000002; + rogueScoreInfo.clear(); + return this; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_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 #getMutableRogueScoreInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getRogueScoreInfo() { + return rogueScoreInfo; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_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 RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableRogueScoreInfo() { + bitField0_ |= 0x00000002; + return rogueScoreInfo; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 3; + * @param value the rogueScoreInfo to set + * @return this + */ + public RogueInfoData setRogueScoreInfo( + final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { + bitField0_ |= 0x00000002; + rogueScoreInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueAeonInfo rogue_aeon_info = 10; + * @return whether the rogueAeonInfo field is set + */ + public boolean hasRogueAeonInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RogueAeonInfo rogue_aeon_info = 10; + * @return this + */ + public RogueInfoData clearRogueAeonInfo() { + bitField0_ &= ~0x00000004; + rogueAeonInfo.clear(); + return this; + } + + /** + * optional .RogueAeonInfo rogue_aeon_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 #getMutableRogueAeonInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAeonInfoOuterClass.RogueAeonInfo getRogueAeonInfo() { + return rogueAeonInfo; + } + + /** + * optional .RogueAeonInfo rogue_aeon_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 RogueAeonInfoOuterClass.RogueAeonInfo getMutableRogueAeonInfo() { + bitField0_ |= 0x00000004; + return rogueAeonInfo; + } + + /** + * optional .RogueAeonInfo rogue_aeon_info = 10; + * @param value the rogueAeonInfo to set + * @return this + */ + public RogueInfoData setRogueAeonInfo(final RogueAeonInfoOuterClass.RogueAeonInfo value) { + bitField0_ |= 0x00000004; + rogueAeonInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + * @return whether the rogueVirtualItemInfo field is set + */ + public boolean hasRogueVirtualItemInfo() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + * @return this + */ + public RogueInfoData clearRogueVirtualItemInfo() { + bitField0_ &= ~0x00000008; + rogueVirtualItemInfo.clear(); + return this; + } + + /** + * optional .RogueCurVirtualItemInfo rogue_virtual_item_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 #getMutableRogueVirtualItemInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getRogueVirtualItemInfo() { + return rogueVirtualItemInfo; + } + + /** + * optional .RogueCurVirtualItemInfo rogue_virtual_item_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 RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getMutableRogueVirtualItemInfo( + ) { + bitField0_ |= 0x00000008; + return rogueVirtualItemInfo; + } + + /** + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + * @param value the rogueVirtualItemInfo to set + * @return this + */ + public RogueInfoData setRogueVirtualItemInfo( + final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo value) { + bitField0_ |= 0x00000008; + rogueVirtualItemInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueSeasonInfo rogue_season_info = 14; + * @return whether the rogueSeasonInfo field is set + */ + public boolean hasRogueSeasonInfo() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueSeasonInfo rogue_season_info = 14; + * @return this + */ + public RogueInfoData clearRogueSeasonInfo() { + bitField0_ &= ~0x00000010; + rogueSeasonInfo.clear(); + return this; + } + + /** + * optional .RogueSeasonInfo rogue_season_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 #getMutableRogueSeasonInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() { + return rogueSeasonInfo; + } + + /** + * optional .RogueSeasonInfo rogue_season_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 RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() { + bitField0_ |= 0x00000010; + return rogueSeasonInfo; + } + + /** + * optional .RogueSeasonInfo rogue_season_info = 14; + * @param value the rogueSeasonInfo to set + * @return this + */ + public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) { + bitField0_ |= 0x00000010; + rogueSeasonInfo.copyFrom(value); + return this; + } + @Override public RogueInfoData copyFrom(final RogueInfoData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueVirtualItemInfo.copyFrom(other.rogueVirtualItemInfo); - rogueAeonInfo.copyFrom(other.rogueAeonInfo); - rogueSeasonInfo.copyFrom(other.rogueSeasonInfo); - rogueScoreInfo.copyFrom(other.rogueScoreInfo); rogueAreaInfo.copyFrom(other.rogueAreaInfo); + rogueScoreInfo.copyFrom(other.rogueScoreInfo); + rogueAeonInfo.copyFrom(other.rogueAeonInfo); + rogueVirtualItemInfo.copyFrom(other.rogueVirtualItemInfo); + rogueSeasonInfo.copyFrom(other.rogueSeasonInfo); } return this; } @@ -361,20 +361,20 @@ public final class RogueInfoDataOuterClass { return this; } cachedSize = -1; - if (other.hasRogueVirtualItemInfo()) { - getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo); - } - if (other.hasRogueAeonInfo()) { - getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); - } - if (other.hasRogueSeasonInfo()) { - getMutableRogueSeasonInfo().mergeFrom(other.rogueSeasonInfo); + if (other.hasRogueAreaInfo()) { + getMutableRogueAreaInfo().mergeFrom(other.rogueAreaInfo); } if (other.hasRogueScoreInfo()) { getMutableRogueScoreInfo().mergeFrom(other.rogueScoreInfo); } - if (other.hasRogueAreaInfo()) { - getMutableRogueAreaInfo().mergeFrom(other.rogueAreaInfo); + if (other.hasRogueAeonInfo()) { + getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); + } + if (other.hasRogueVirtualItemInfo()) { + getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo); + } + if (other.hasRogueSeasonInfo()) { + getMutableRogueSeasonInfo().mergeFrom(other.rogueSeasonInfo); } return this; } @@ -386,11 +386,11 @@ public final class RogueInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueVirtualItemInfo.clear(); - rogueAeonInfo.clear(); - rogueSeasonInfo.clear(); - rogueScoreInfo.clear(); rogueAreaInfo.clear(); + rogueScoreInfo.clear(); + rogueAeonInfo.clear(); + rogueVirtualItemInfo.clear(); + rogueSeasonInfo.clear(); return this; } @@ -401,11 +401,11 @@ public final class RogueInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueVirtualItemInfo.clearQuick(); - rogueAeonInfo.clearQuick(); - rogueSeasonInfo.clearQuick(); - rogueScoreInfo.clearQuick(); rogueAreaInfo.clearQuick(); + rogueScoreInfo.clearQuick(); + rogueAeonInfo.clearQuick(); + rogueVirtualItemInfo.clearQuick(); + rogueSeasonInfo.clearQuick(); return this; } @@ -419,34 +419,34 @@ public final class RogueInfoDataOuterClass { } RogueInfoData other = (RogueInfoData) o; return bitField0_ == other.bitField0_ - && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo)) - && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) - && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo)) + && (!hasRogueAreaInfo() || rogueAreaInfo.equals(other.rogueAreaInfo)) && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo)) - && (!hasRogueAreaInfo() || rogueAreaInfo.equals(other.rogueAreaInfo)); + && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) + && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo)) + && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 18); - output.writeMessageNoTag(rogueVirtualItemInfo); + output.writeMessageNoTag(rogueAreaInfo); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 26); - output.writeMessageNoTag(rogueAeonInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(rogueSeasonInfo); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 82); output.writeMessageNoTag(rogueScoreInfo); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(rogueAeonInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(rogueVirtualItemInfo); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(rogueAreaInfo); + output.writeRawByte((byte) 114); + output.writeMessageNoTag(rogueSeasonInfo); } } @@ -454,19 +454,19 @@ public final class RogueInfoDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItemInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAreaInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItemInfo); + } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAreaInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo); } return size; } @@ -479,8 +479,8 @@ public final class RogueInfoDataOuterClass { while (true) { switch (tag) { case 18: { - // rogueVirtualItemInfo - input.readMessage(rogueVirtualItemInfo); + // rogueAreaInfo + input.readMessage(rogueAreaInfo); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 26) { @@ -488,35 +488,35 @@ public final class RogueInfoDataOuterClass { } } case 26: { - // rogueAeonInfo - input.readMessage(rogueAeonInfo); + // rogueScoreInfo + input.readMessage(rogueScoreInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { - // rogueSeasonInfo - input.readMessage(rogueSeasonInfo); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 82) { break; } } case 82: { - // rogueScoreInfo - input.readMessage(rogueScoreInfo); - bitField0_ |= 0x00000008; + // rogueAeonInfo + input.readMessage(rogueAeonInfo); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 90) { break; } } - case 98: { - // rogueAreaInfo - input.readMessage(rogueAreaInfo); + case 90: { + // rogueVirtualItemInfo + input.readMessage(rogueVirtualItemInfo); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // rogueSeasonInfo + input.readMessage(rogueSeasonInfo); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -541,19 +541,19 @@ public final class RogueInfoDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rogueVirtualItemInfo, rogueVirtualItemInfo); + output.writeMessage(FieldNames.rogueAreaInfo, rogueAreaInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.rogueVirtualItemInfo, rogueVirtualItemInfo); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.rogueAreaInfo, rogueAreaInfo); + output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo); } output.endObject(); } @@ -565,11 +565,11 @@ public final class RogueInfoDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1066755410: - case 1452147457: { - if (input.isAtField(FieldNames.rogueVirtualItemInfo)) { + case 964297429: + case -851505925: { + if (input.isAtField(FieldNames.rogueAreaInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueVirtualItemInfo); + input.readMessage(rogueAreaInfo); bitField0_ |= 0x00000001; } } else { @@ -577,35 +577,35 @@ public final class RogueInfoDataOuterClass { } break; } - case -1685018549: - case -1375922619: { - if (input.isAtField(FieldNames.rogueAeonInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueAeonInfo); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1037341781: - case -588845659: { - if (input.isAtField(FieldNames.rogueSeasonInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueSeasonInfo); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 2078217638: case -208816704: { if (input.isAtField(FieldNames.rogueScoreInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueScoreInfo); + bitField0_ |= 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 1066755410: + case 1452147457: { + if (input.isAtField(FieldNames.rogueVirtualItemInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueVirtualItemInfo); bitField0_ |= 0x00000008; } } else { @@ -613,11 +613,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_ |= 0x00000010; } } else { @@ -677,15 +677,15 @@ public final class RogueInfoDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueVirtualItemInfo = FieldName.forField("rogueVirtualItemInfo", "rogue_virtual_item_info"); - - static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); - - static final FieldName rogueSeasonInfo = FieldName.forField("rogueSeasonInfo", "rogue_season_info"); + static final FieldName rogueAreaInfo = FieldName.forField("rogueAreaInfo", "rogue_area_info"); static final FieldName rogueScoreInfo = FieldName.forField("rogueScoreInfo", "rogue_score_info"); - static final FieldName rogueAreaInfo = FieldName.forField("rogueAreaInfo", "rogue_area_info"); + static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); + + static final FieldName rogueVirtualItemInfo = FieldName.forField("rogueVirtualItemInfo", "rogue_virtual_item_info"); + + static final FieldName rogueSeasonInfo = FieldName.forField("rogueSeasonInfo", "rogue_season_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java index 5f3a5a2..390059c 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java @@ -19,12 +19,12 @@ public final class RogueInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueInfoData rogue_info_data = 653; + * optional .RogueInfoData rogue_info_data = 306; */ private final RogueInfoDataOuterClass.RogueInfoData rogueInfoData = RogueInfoDataOuterClass.RogueInfoData.newInstance(); /** - * optional .RogueCurrentInfo rogue_current_info = 1128; + * optional .RogueCurrentInfo rogue_current_info = 1019; */ private final RogueCurrentInfoOuterClass.RogueCurrentInfo rogueCurrentInfo = RogueCurrentInfoOuterClass.RogueCurrentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 653; + * optional .RogueInfoData rogue_info_data = 306; * @return whether the rogueInfoData field is set */ public boolean hasRogueInfoData() { @@ -47,7 +47,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 653; + * optional .RogueInfoData rogue_info_data = 306; * @return this */ public RogueInfo clearRogueInfoData() { @@ -57,7 +57,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 653; + * optional .RogueInfoData rogue_info_data = 306; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -71,7 +71,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 653; + * optional .RogueInfoData rogue_info_data = 306; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -85,7 +85,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 653; + * optional .RogueInfoData rogue_info_data = 306; * @param value the rogueInfoData to set * @return this */ @@ -96,7 +96,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1128; + * optional .RogueCurrentInfo rogue_current_info = 1019; * @return whether the rogueCurrentInfo field is set */ public boolean hasRogueCurrentInfo() { @@ -104,7 +104,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1128; + * optional .RogueCurrentInfo rogue_current_info = 1019; * @return this */ public RogueInfo clearRogueCurrentInfo() { @@ -114,7 +114,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1128; + * optional .RogueCurrentInfo rogue_current_info = 1019; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -128,7 +128,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1128; + * optional .RogueCurrentInfo rogue_current_info = 1019; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -142,7 +142,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1128; + * optional .RogueCurrentInfo rogue_current_info = 1019; * @param value the rogueCurrentInfo to set * @return this */ @@ -219,11 +219,11 @@ public final class RogueInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 10474); + output.writeRawLittleEndian16((short) 5010); output.writeMessageNoTag(rogueInfoData); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 18114); + output.writeRawLittleEndian16((short) 16346); output.writeMessageNoTag(rogueCurrentInfo); } } @@ -247,16 +247,16 @@ public final class RogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 5226: { + case 2450: { // rogueInfoData input.readMessage(rogueInfoData); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 9026) { + if (tag != 8154) { break; } } - case 9026: { + case 8154: { // rogueCurrentInfo input.readMessage(rogueCurrentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java index 022ea53..b928eb8 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java @@ -20,27 +20,27 @@ public final class RogueMapInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 area_id = 1; + * optional uint32 area_id = 4; */ private int areaId; /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 12; */ private int curSiteId; /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 13; */ private int mapId; /** - * optional uint32 cur_room_id = 13; + * optional uint32 cur_room_id = 15; */ private int curRoomId; /** - * repeated .RogueRoom room_list = 4; + * repeated .RogueRoom room_list = 10; */ private final RepeatedMessage roomList = RepeatedMessage.newEmptyInstance(RogueRoomOuterClass.RogueRoom.getFactory()); @@ -55,7 +55,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 area_id = 1; + * optional uint32 area_id = 4; * @return whether the areaId field is set */ public boolean hasAreaId() { @@ -63,7 +63,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 area_id = 1; + * optional uint32 area_id = 4; * @return this */ public RogueMapInfo clearAreaId() { @@ -73,7 +73,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 area_id = 1; + * optional uint32 area_id = 4; * @return the areaId */ public int getAreaId() { @@ -81,7 +81,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 area_id = 1; + * optional uint32 area_id = 4; * @param value the areaId to set * @return this */ @@ -92,7 +92,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 12; * @return whether the curSiteId field is set */ public boolean hasCurSiteId() { @@ -100,7 +100,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 12; * @return this */ public RogueMapInfo clearCurSiteId() { @@ -110,7 +110,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 12; * @return the curSiteId */ public int getCurSiteId() { @@ -118,7 +118,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 12; * @param value the curSiteId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 13; * @return whether the mapId field is set */ public boolean hasMapId() { @@ -137,7 +137,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 13; * @return this */ public RogueMapInfo clearMapId() { @@ -147,7 +147,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 13; * @return the mapId */ public int getMapId() { @@ -155,7 +155,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 13; * @param value the mapId to set * @return this */ @@ -166,7 +166,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_room_id = 13; + * optional uint32 cur_room_id = 15; * @return whether the curRoomId field is set */ public boolean hasCurRoomId() { @@ -174,7 +174,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_room_id = 13; + * optional uint32 cur_room_id = 15; * @return this */ public RogueMapInfo clearCurRoomId() { @@ -184,7 +184,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_room_id = 13; + * optional uint32 cur_room_id = 15; * @return the curRoomId */ public int getCurRoomId() { @@ -192,7 +192,7 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_room_id = 13; + * optional uint32 cur_room_id = 15; * @param value the curRoomId to set * @return this */ @@ -203,7 +203,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 4; + * repeated .RogueRoom room_list = 10; * @return whether the roomList field is set */ public boolean hasRoomList() { @@ -211,7 +211,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 4; + * repeated .RogueRoom room_list = 10; * @return this */ public RogueMapInfo clearRoomList() { @@ -221,7 +221,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 4; + * repeated .RogueRoom room_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. @@ -235,7 +235,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 4; + * repeated .RogueRoom room_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 @@ -249,7 +249,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 4; + * repeated .RogueRoom room_list = 10; * @param value the roomList to add * @return this */ @@ -260,7 +260,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 4; + * repeated .RogueRoom room_list = 10; * @param values the roomList to add * @return this */ @@ -354,24 +354,24 @@ public final class RogueMapInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(curSiteId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(mapId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(curRoomId); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < roomList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 82); output.writeMessageNoTag(roomList.get(i)); } } @@ -405,43 +405,43 @@ public final class RogueMapInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 32: { // areaId areaId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 96) { break; } } - case 16: { + case 96: { // curSiteId curSiteId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // mapId - mapId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 104) { break; } } case 104: { + // mapId + mapId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // curRoomId curRoomId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 34) { + if (tag != 82) { break; } } - case 34: { + case 82: { // roomList tag = input.readRepeatedMessage(roomList, tag); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java index 9085bbd..3bd587a 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java @@ -20,7 +20,12 @@ public final class RogueMiracleDataInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 KABNOGFDKFI = 2; + * optional uint32 NFNNOMAMNAA = 4; + */ + private int nFNNOMAMNAA; + + /** + * optional uint32 KABNOGFDKFI = 6; */ private int kABNOGFDKFI; @@ -30,17 +35,12 @@ public final class RogueMiracleDataInfoOuterClass { private int nDPAMBJKKFD; /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 13; */ private int miracleId; /** - * optional uint32 NFNNOMAMNAA = 12; - */ - private int nFNNOMAMNAA; - - /** - * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 12; */ private final RepeatedMessage jBFJGEIGGBA = RepeatedMessage.newEmptyInstance(JBFJGEIGGBAEntry.getFactory()); @@ -55,25 +55,62 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 KABNOGFDKFI = 2; - * @return whether the kABNOGFDKFI field is set + * optional uint32 NFNNOMAMNAA = 4; + * @return whether the nFNNOMAMNAA field is set */ - public boolean hasKABNOGFDKFI() { + public boolean hasNFNNOMAMNAA() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 KABNOGFDKFI = 2; + * optional uint32 NFNNOMAMNAA = 4; + * @return this + */ + public RogueMiracleDataInfo clearNFNNOMAMNAA() { + bitField0_ &= ~0x00000001; + nFNNOMAMNAA = 0; + return this; + } + + /** + * optional uint32 NFNNOMAMNAA = 4; + * @return the nFNNOMAMNAA + */ + public int getNFNNOMAMNAA() { + return nFNNOMAMNAA; + } + + /** + * optional uint32 NFNNOMAMNAA = 4; + * @param value the nFNNOMAMNAA to set + * @return this + */ + public RogueMiracleDataInfo setNFNNOMAMNAA(final int value) { + bitField0_ |= 0x00000001; + nFNNOMAMNAA = value; + return this; + } + + /** + * optional uint32 KABNOGFDKFI = 6; + * @return whether the kABNOGFDKFI field is set + */ + public boolean hasKABNOGFDKFI() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 KABNOGFDKFI = 6; * @return this */ public RogueMiracleDataInfo clearKABNOGFDKFI() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; kABNOGFDKFI = 0; return this; } /** - * optional uint32 KABNOGFDKFI = 2; + * optional uint32 KABNOGFDKFI = 6; * @return the kABNOGFDKFI */ public int getKABNOGFDKFI() { @@ -81,12 +118,12 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 KABNOGFDKFI = 2; + * optional uint32 KABNOGFDKFI = 6; * @param value the kABNOGFDKFI to set * @return this */ public RogueMiracleDataInfo setKABNOGFDKFI(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; kABNOGFDKFI = value; return this; } @@ -96,7 +133,7 @@ public final class RogueMiracleDataInfoOuterClass { * @return whether the nDPAMBJKKFD field is set */ public boolean hasNDPAMBJKKFD() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -104,7 +141,7 @@ public final class RogueMiracleDataInfoOuterClass { * @return this */ public RogueMiracleDataInfo clearNDPAMBJKKFD() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; nDPAMBJKKFD = 0; return this; } @@ -123,31 +160,31 @@ public final class RogueMiracleDataInfoOuterClass { * @return this */ public RogueMiracleDataInfo setNDPAMBJKKFD(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; nDPAMBJKKFD = value; return this; } /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 13; * @return whether the miracleId field is set */ public boolean hasMiracleId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 13; * @return this */ public RogueMiracleDataInfo clearMiracleId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; miracleId = 0; return this; } /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 13; * @return the miracleId */ public int getMiracleId() { @@ -155,55 +192,18 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 13; * @param value the miracleId to set * @return this */ public RogueMiracleDataInfo setMiracleId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; miracleId = value; return this; } /** - * optional uint32 NFNNOMAMNAA = 12; - * @return whether the nFNNOMAMNAA field is set - */ - public boolean hasNFNNOMAMNAA() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 NFNNOMAMNAA = 12; - * @return this - */ - public RogueMiracleDataInfo clearNFNNOMAMNAA() { - bitField0_ &= ~0x00000008; - nFNNOMAMNAA = 0; - return this; - } - - /** - * optional uint32 NFNNOMAMNAA = 12; - * @return the nFNNOMAMNAA - */ - public int getNFNNOMAMNAA() { - return nFNNOMAMNAA; - } - - /** - * optional uint32 NFNNOMAMNAA = 12; - * @param value the nFNNOMAMNAA to set - * @return this - */ - public RogueMiracleDataInfo setNFNNOMAMNAA(final int value) { - bitField0_ |= 0x00000008; - nFNNOMAMNAA = value; - return this; - } - - /** - * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 12; * @return whether the jBFJGEIGGBA field is set */ public boolean hasJBFJGEIGGBA() { @@ -211,7 +211,7 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 12; * @return this */ public RogueMiracleDataInfo clearJBFJGEIGGBA() { @@ -221,7 +221,7 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 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. @@ -235,7 +235,7 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 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 @@ -249,7 +249,7 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 12; * @param value the jBFJGEIGGBA to add * @return this */ @@ -260,7 +260,7 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 12; * @param values the jBFJGEIGGBA to add * @return this */ @@ -275,10 +275,10 @@ public final class RogueMiracleDataInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + nFNNOMAMNAA = other.nFNNOMAMNAA; kABNOGFDKFI = other.kABNOGFDKFI; nDPAMBJKKFD = other.nDPAMBJKKFD; miracleId = other.miracleId; - nFNNOMAMNAA = other.nFNNOMAMNAA; jBFJGEIGGBA.copyFrom(other.jBFJGEIGGBA); } return this; @@ -290,6 +290,9 @@ public final class RogueMiracleDataInfoOuterClass { return this; } cachedSize = -1; + if (other.hasNFNNOMAMNAA()) { + setNFNNOMAMNAA(other.nFNNOMAMNAA); + } if (other.hasKABNOGFDKFI()) { setKABNOGFDKFI(other.kABNOGFDKFI); } @@ -299,9 +302,6 @@ public final class RogueMiracleDataInfoOuterClass { if (other.hasMiracleId()) { setMiracleId(other.miracleId); } - if (other.hasNFNNOMAMNAA()) { - setNFNNOMAMNAA(other.nFNNOMAMNAA); - } if (other.hasJBFJGEIGGBA()) { getMutableJBFJGEIGGBA().addAll(other.jBFJGEIGGBA); } @@ -315,10 +315,10 @@ public final class RogueMiracleDataInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + nFNNOMAMNAA = 0; kABNOGFDKFI = 0; nDPAMBJKKFD = 0; miracleId = 0; - nFNNOMAMNAA = 0; jBFJGEIGGBA.clear(); return this; } @@ -344,34 +344,34 @@ public final class RogueMiracleDataInfoOuterClass { } RogueMiracleDataInfo other = (RogueMiracleDataInfo) o; return bitField0_ == other.bitField0_ + && (!hasNFNNOMAMNAA() || nFNNOMAMNAA == other.nFNNOMAMNAA) && (!hasKABNOGFDKFI() || kABNOGFDKFI == other.kABNOGFDKFI) && (!hasNDPAMBJKKFD() || nDPAMBJKKFD == other.nDPAMBJKKFD) && (!hasMiracleId() || miracleId == other.miracleId) - && (!hasNFNNOMAMNAA() || nFNNOMAMNAA == other.nFNNOMAMNAA) && (!hasJBFJGEIGGBA() || jBFJGEIGGBA.equals(other.jBFJGEIGGBA)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(kABNOGFDKFI); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(nFNNOMAMNAA); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(kABNOGFDKFI); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 72); output.writeUInt32NoTag(nDPAMBJKKFD); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(miracleId); - } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(nFNNOMAMNAA); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(miracleId); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < jBFJGEIGGBA.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(jBFJGEIGGBA.get(i)); } } @@ -381,16 +381,16 @@ public final class RogueMiracleDataInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kABNOGFDKFI); + size += 1 + ProtoSink.computeUInt32SizeNoTag(nFNNOMAMNAA); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nDPAMBJKKFD); + size += 1 + ProtoSink.computeUInt32SizeNoTag(kABNOGFDKFI); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(nDPAMBJKKFD); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nFNNOMAMNAA); + size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * jBFJGEIGGBA.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(jBFJGEIGGBA); @@ -405,10 +405,19 @@ public final class RogueMiracleDataInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 32: { + // nFNNOMAMNAA + nFNNOMAMNAA = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { // kABNOGFDKFI kABNOGFDKFI = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 72) { break; @@ -417,31 +426,22 @@ public final class RogueMiracleDataInfoOuterClass { case 72: { // nDPAMBJKKFD nDPAMBJKKFD = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // miracleId - miracleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // nFNNOMAMNAA - nFNNOMAMNAA = input.readUInt32(); + case 104: { + // miracleId + miracleId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 50) { + if (tag != 98) { break; } } - case 50: { + case 98: { // jBFJGEIGGBA tag = input.readRepeatedMessage(jBFJGEIGGBA, tag); bitField0_ |= 0x00000010; @@ -467,16 +467,16 @@ public final class RogueMiracleDataInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.kABNOGFDKFI, kABNOGFDKFI); + output.writeUInt32(FieldNames.nFNNOMAMNAA, nFNNOMAMNAA); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.nDPAMBJKKFD, nDPAMBJKKFD); + output.writeUInt32(FieldNames.kABNOGFDKFI, kABNOGFDKFI); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.miracleId, miracleId); + output.writeUInt32(FieldNames.nDPAMBJKKFD, nDPAMBJKKFD); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.nFNNOMAMNAA, nFNNOMAMNAA); + output.writeUInt32(FieldNames.miracleId, miracleId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.jBFJGEIGGBA, jBFJGEIGGBA); @@ -491,11 +491,22 @@ public final class RogueMiracleDataInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -681412180: { + if (input.isAtField(FieldNames.nFNNOMAMNAA)) { + if (!input.trySkipNullValue()) { + nFNNOMAMNAA = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 1444231062: { if (input.isAtField(FieldNames.kABNOGFDKFI)) { if (!input.trySkipNullValue()) { kABNOGFDKFI = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -506,7 +517,7 @@ public final class RogueMiracleDataInfoOuterClass { if (input.isAtField(FieldNames.nDPAMBJKKFD)) { if (!input.trySkipNullValue()) { nDPAMBJKKFD = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -518,17 +529,6 @@ public final class RogueMiracleDataInfoOuterClass { if (input.isAtField(FieldNames.miracleId)) { if (!input.trySkipNullValue()) { miracleId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -681412180: { - if (input.isAtField(FieldNames.nFNNOMAMNAA)) { - if (!input.trySkipNullValue()) { - nFNNOMAMNAA = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -925,14 +925,14 @@ public final class RogueMiracleDataInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName nFNNOMAMNAA = FieldName.forField("NFNNOMAMNAA"); + static final FieldName kABNOGFDKFI = FieldName.forField("KABNOGFDKFI"); static final FieldName nDPAMBJKKFD = FieldName.forField("NDPAMBJKKFD"); static final FieldName miracleId = FieldName.forField("miracleId", "miracle_id"); - static final FieldName nFNNOMAMNAA = FieldName.forField("NFNNOMAMNAA"); - static final FieldName jBFJGEIGGBA = FieldName.forField("JBFJGEIGGBA"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java index 8cb9313..47d06d1 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java @@ -19,11 +19,7 @@ public final class RogueMiracleDataOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  13, 2 or 6
-     *
- * - * optional .RogueMiracle rogue_miracle = 2; + * optional .RogueMiracle rogue_miracle = 11; */ private final RogueMiracleOuterClass.RogueMiracle rogueMiracle = RogueMiracleOuterClass.RogueMiracle.newInstance(); @@ -38,11 +34,7 @@ public final class RogueMiracleDataOuterClass { } /** - * 
-     *  13, 2 or 6
-     *
- * - * optional .RogueMiracle rogue_miracle = 2; + * optional .RogueMiracle rogue_miracle = 11; * @return whether the rogueMiracle field is set */ public boolean hasRogueMiracle() { @@ -50,11 +42,7 @@ public final class RogueMiracleDataOuterClass { } /** - * 
-     *  13, 2 or 6
-     *
- * - * optional .RogueMiracle rogue_miracle = 2; + * optional .RogueMiracle rogue_miracle = 11; * @return this */ public RogueMiracleData clearRogueMiracle() { @@ -64,11 +52,7 @@ public final class RogueMiracleDataOuterClass { } /** - * 
-     *  13, 2 or 6
-     *
- * - * optional .RogueMiracle rogue_miracle = 2; + * optional .RogueMiracle rogue_miracle = 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. @@ -82,11 +66,7 @@ public final class RogueMiracleDataOuterClass { } /** - * 
-     *  13, 2 or 6
-     *
- * - * optional .RogueMiracle rogue_miracle = 2; + * optional .RogueMiracle rogue_miracle = 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 @@ -100,11 +80,7 @@ public final class RogueMiracleDataOuterClass { } /** - * 
-     *  13, 2 or 6
-     *
- * - * optional .RogueMiracle rogue_miracle = 2; + * optional .RogueMiracle rogue_miracle = 11; * @param value the rogueMiracle to set * @return this */ @@ -174,7 +150,7 @@ public final class RogueMiracleDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rogueMiracle); } } @@ -195,7 +171,7 @@ public final class RogueMiracleDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 90: { // 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 06d3e65..04898b2 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java @@ -20,7 +20,7 @@ public final class RogueMiracleInfoDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 BAILOBNCIGP = 4; + * optional uint32 BAILOBNCIGP = 2; */ private int bAILOBNCIGP; @@ -30,7 +30,7 @@ public final class RogueMiracleInfoDataOuterClass { private int bDDANOBJMEL; /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 12; */ private final RepeatedMessage rogueMiracleList = RepeatedMessage.newEmptyInstance(RogueMiracleDataInfoOuterClass.RogueMiracleDataInfo.getFactory()); @@ -45,7 +45,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 BAILOBNCIGP = 4; + * optional uint32 BAILOBNCIGP = 2; * @return whether the bAILOBNCIGP field is set */ public boolean hasBAILOBNCIGP() { @@ -53,7 +53,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 BAILOBNCIGP = 4; + * optional uint32 BAILOBNCIGP = 2; * @return this */ public RogueMiracleInfoData clearBAILOBNCIGP() { @@ -63,7 +63,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 BAILOBNCIGP = 4; + * optional uint32 BAILOBNCIGP = 2; * @return the bAILOBNCIGP */ public int getBAILOBNCIGP() { @@ -71,7 +71,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 BAILOBNCIGP = 4; + * optional uint32 BAILOBNCIGP = 2; * @param value the bAILOBNCIGP to set * @return this */ @@ -119,7 +119,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 12; * @return whether the rogueMiracleList field is set */ public boolean hasRogueMiracleList() { @@ -127,7 +127,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 12; * @return this */ public RogueMiracleInfoData clearRogueMiracleList() { @@ -137,7 +137,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; + * repeated .RogueMiracleDataInfo rogue_miracle_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. @@ -152,7 +152,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; + * repeated .RogueMiracleDataInfo rogue_miracle_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 @@ -167,7 +167,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 12; * @param value the rogueMiracleList to add * @return this */ @@ -179,7 +179,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 12; * @param values the rogueMiracleList to add * @return this */ @@ -262,7 +262,7 @@ public final class RogueMiracleInfoDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(bAILOBNCIGP); } if ((bitField0_ & 0x00000002) != 0) { @@ -271,7 +271,7 @@ public final class RogueMiracleInfoDataOuterClass { } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < rogueMiracleList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(rogueMiracleList.get(i)); } } @@ -299,7 +299,7 @@ public final class RogueMiracleInfoDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 16: { // bAILOBNCIGP bAILOBNCIGP = input.readUInt32(); bitField0_ |= 0x00000001; @@ -313,11 +313,11 @@ public final class RogueMiracleInfoDataOuterClass { bDDANOBJMEL = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 98) { break; } } - case 50: { + case 98: { // 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 f4b236c..0cc57ed 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 = 14; + * optional .RogueMiracleInfoData rogue_miracle_info = 11; */ private final RogueMiracleInfoDataOuterClass.RogueMiracleInfoData rogueMiracleInfo = RogueMiracleInfoDataOuterClass.RogueMiracleInfoData.newInstance(); @@ -34,7 +34,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 14; + * optional .RogueMiracleInfoData rogue_miracle_info = 11; * @return whether the rogueMiracleInfo field is set */ public boolean hasRogueMiracleInfo() { @@ -42,7 +42,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 14; + * optional .RogueMiracleInfoData rogue_miracle_info = 11; * @return this */ public RogueMiracleInfo clearRogueMiracleInfo() { @@ -52,7 +52,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 14; + * optional .RogueMiracleInfoData rogue_miracle_info = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 14; + * optional .RogueMiracleInfoData rogue_miracle_info = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 14; + * optional .RogueMiracleInfoData rogue_miracle_info = 11; * @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) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rogueMiracleInfo); } } @@ -172,7 +172,7 @@ public final class RogueMiracleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 90: { // rogueMiracleInfo input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleOuterClass.java index 3ea1aec..7950b5c 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleOuterClass.java @@ -24,12 +24,12 @@ public final class RogueMiracleOuterClass { * was set to 3 in pcap * * - * optional uint32 NKBEHFHLPEF = 1; + * optional uint32 NKBEHFHLPEF = 6; */ private int nKBEHFHLPEF; /** - * optional uint32 MMFONFFPNJM = 4; + * optional uint32 MMFONFFPNJM = 9; */ private int mMFONFFPNJM; @@ -39,7 +39,7 @@ public final class RogueMiracleOuterClass { private int miracleId; /** - * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10; + * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 3; */ private final RepeatedMessage kONAGCDHKKH = RepeatedMessage.newEmptyInstance(KONAGCDHKKHEntry.getFactory()); @@ -58,7 +58,7 @@ public final class RogueMiracleOuterClass { * was set to 3 in pcap * * - * optional uint32 NKBEHFHLPEF = 1; + * optional uint32 NKBEHFHLPEF = 6; * @return whether the nKBEHFHLPEF field is set */ public boolean hasNKBEHFHLPEF() { @@ -70,7 +70,7 @@ public final class RogueMiracleOuterClass { * was set to 3 in pcap * * - * optional uint32 NKBEHFHLPEF = 1; + * optional uint32 NKBEHFHLPEF = 6; * @return this */ public RogueMiracle clearNKBEHFHLPEF() { @@ -84,7 +84,7 @@ public final class RogueMiracleOuterClass { * was set to 3 in pcap * * - * optional uint32 NKBEHFHLPEF = 1; + * optional uint32 NKBEHFHLPEF = 6; * @return the nKBEHFHLPEF */ public int getNKBEHFHLPEF() { @@ -96,7 +96,7 @@ public final class RogueMiracleOuterClass { * was set to 3 in pcap * * - * optional uint32 NKBEHFHLPEF = 1; + * optional uint32 NKBEHFHLPEF = 6; * @param value the nKBEHFHLPEF to set * @return this */ @@ -107,7 +107,7 @@ public final class RogueMiracleOuterClass { } /** - * optional uint32 MMFONFFPNJM = 4; + * optional uint32 MMFONFFPNJM = 9; * @return whether the mMFONFFPNJM field is set */ public boolean hasMMFONFFPNJM() { @@ -115,7 +115,7 @@ public final class RogueMiracleOuterClass { } /** - * optional uint32 MMFONFFPNJM = 4; + * optional uint32 MMFONFFPNJM = 9; * @return this */ public RogueMiracle clearMMFONFFPNJM() { @@ -125,7 +125,7 @@ public final class RogueMiracleOuterClass { } /** - * optional uint32 MMFONFFPNJM = 4; + * optional uint32 MMFONFFPNJM = 9; * @return the mMFONFFPNJM */ public int getMMFONFFPNJM() { @@ -133,7 +133,7 @@ public final class RogueMiracleOuterClass { } /** - * optional uint32 MMFONFFPNJM = 4; + * optional uint32 MMFONFFPNJM = 9; * @param value the mMFONFFPNJM to set * @return this */ @@ -181,7 +181,7 @@ public final class RogueMiracleOuterClass { } /** - * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10; + * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 3; * @return whether the kONAGCDHKKH field is set */ public boolean hasKONAGCDHKKH() { @@ -189,7 +189,7 @@ public final class RogueMiracleOuterClass { } /** - * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10; + * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 3; * @return this */ public RogueMiracle clearKONAGCDHKKH() { @@ -199,7 +199,7 @@ public final class RogueMiracleOuterClass { } /** - * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10; + * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 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. @@ -213,7 +213,7 @@ public final class RogueMiracleOuterClass { } /** - * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10; + * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 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 @@ -227,7 +227,7 @@ public final class RogueMiracleOuterClass { } /** - * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10; + * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 3; * @param value the kONAGCDHKKH to add * @return this */ @@ -238,7 +238,7 @@ public final class RogueMiracleOuterClass { } /** - * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10; + * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 3; * @param values the kONAGCDHKKH to add * @return this */ @@ -326,11 +326,11 @@ public final class RogueMiracleOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(nKBEHFHLPEF); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(mMFONFFPNJM); } if ((bitField0_ & 0x00000004) != 0) { @@ -339,7 +339,7 @@ public final class RogueMiracleOuterClass { } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < kONAGCDHKKH.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 26); output.writeMessageNoTag(kONAGCDHKKH.get(i)); } } @@ -370,16 +370,16 @@ public final class RogueMiracleOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // nKBEHFHLPEF nKBEHFHLPEF = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 72) { break; } } - case 32: { + case 72: { // mMFONFFPNJM mMFONFFPNJM = input.readUInt32(); bitField0_ |= 0x00000002; @@ -393,11 +393,11 @@ public final class RogueMiracleOuterClass { miracleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 82) { + if (tag != 26) { break; } } - case 82: { + case 26: { // kONAGCDHKKH tag = input.readRepeatedMessage(kONAGCDHKKH, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java index 48f7bae..2b80fb9 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueMiracleSelectInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 JDDLGDNOIEC = 10; + * optional uint32 JDDLGDNOIEC = 5; */ private int jDDLGDNOIEC; @@ -29,12 +29,12 @@ public final class RogueMiracleSelectInfoOuterClass { * CMHBBMOKJJB EOIFGPMGFGJ = 11; * * - * repeated uint32 miracle_info_remote = 12; + * repeated uint32 miracle_info_remote = 9; */ private final RepeatedInt miracleInfoRemote = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 miracle_info = 15; + * repeated uint32 miracle_info = 13; */ private final RepeatedInt miracleInfo = RepeatedInt.newEmptyInstance(); @@ -49,7 +49,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional uint32 JDDLGDNOIEC = 10; + * optional uint32 JDDLGDNOIEC = 5; * @return whether the jDDLGDNOIEC field is set */ public boolean hasJDDLGDNOIEC() { @@ -57,7 +57,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional uint32 JDDLGDNOIEC = 10; + * optional uint32 JDDLGDNOIEC = 5; * @return this */ public RogueMiracleSelectInfo clearJDDLGDNOIEC() { @@ -67,7 +67,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional uint32 JDDLGDNOIEC = 10; + * optional uint32 JDDLGDNOIEC = 5; * @return the jDDLGDNOIEC */ public int getJDDLGDNOIEC() { @@ -75,7 +75,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * optional uint32 JDDLGDNOIEC = 10; + * optional uint32 JDDLGDNOIEC = 5; * @param value the jDDLGDNOIEC to set * @return this */ @@ -90,7 +90,7 @@ public final class RogueMiracleSelectInfoOuterClass { * CMHBBMOKJJB EOIFGPMGFGJ = 11; * * - * repeated uint32 miracle_info_remote = 12; + * repeated uint32 miracle_info_remote = 9; * @return whether the miracleInfoRemote field is set */ public boolean hasMiracleInfoRemote() { @@ -102,7 +102,7 @@ public final class RogueMiracleSelectInfoOuterClass { * CMHBBMOKJJB EOIFGPMGFGJ = 11; * * - * repeated uint32 miracle_info_remote = 12; + * repeated uint32 miracle_info_remote = 9; * @return this */ public RogueMiracleSelectInfo clearMiracleInfoRemote() { @@ -116,7 +116,7 @@ public final class RogueMiracleSelectInfoOuterClass { * CMHBBMOKJJB EOIFGPMGFGJ = 11; * * - * repeated uint32 miracle_info_remote = 12; + * repeated uint32 miracle_info_remote = 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. @@ -134,7 +134,7 @@ public final class RogueMiracleSelectInfoOuterClass { * CMHBBMOKJJB EOIFGPMGFGJ = 11; * * - * repeated uint32 miracle_info_remote = 12; + * repeated uint32 miracle_info_remote = 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 @@ -152,7 +152,7 @@ public final class RogueMiracleSelectInfoOuterClass { * CMHBBMOKJJB EOIFGPMGFGJ = 11; * * - * repeated uint32 miracle_info_remote = 12; + * repeated uint32 miracle_info_remote = 9; * @param value the miracleInfoRemote to add * @return this */ @@ -167,7 +167,7 @@ public final class RogueMiracleSelectInfoOuterClass { * CMHBBMOKJJB EOIFGPMGFGJ = 11; * * - * repeated uint32 miracle_info_remote = 12; + * repeated uint32 miracle_info_remote = 9; * @param values the miracleInfoRemote to add * @return this */ @@ -178,7 +178,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_info = 15; + * repeated uint32 miracle_info = 13; * @return whether the miracleInfo field is set */ public boolean hasMiracleInfo() { @@ -186,7 +186,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_info = 15; + * repeated uint32 miracle_info = 13; * @return this */ public RogueMiracleSelectInfo clearMiracleInfo() { @@ -196,7 +196,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_info = 15; + * repeated uint32 miracle_info = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -210,7 +210,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_info = 15; + * repeated uint32 miracle_info = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -224,7 +224,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_info = 15; + * repeated uint32 miracle_info = 13; * @param value the miracleInfo to add * @return this */ @@ -235,7 +235,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_info = 15; + * repeated uint32 miracle_info = 13; * @param values the miracleInfo to add * @return this */ @@ -318,18 +318,18 @@ public final class RogueMiracleSelectInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(jDDLGDNOIEC); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < miracleInfoRemote.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(miracleInfoRemote.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < miracleInfo.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(miracleInfo.array()[i]); } } @@ -357,25 +357,25 @@ public final class RogueMiracleSelectInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 40: { // jDDLGDNOIEC jDDLGDNOIEC = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 74) { break; } } - case 98: { + case 74: { // miracleInfoRemote [packed=true] input.readPackedUInt32(miracleInfoRemote, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { + case 106: { // miracleInfo [packed=true] input.readPackedUInt32(miracleInfo, tag); bitField0_ |= 0x00000004; @@ -394,13 +394,13 @@ public final class RogueMiracleSelectInfoOuterClass { tag = input.readTag(); break; } - case 96: { + case 72: { // miracleInfoRemote [packed=false] tag = input.readRepeatedUInt32(miracleInfoRemote, tag); bitField0_ |= 0x00000002; break; } - case 120: { + case 104: { // miracleInfo [packed=false] tag = input.readRepeatedUInt32(miracleInfo, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleSourceOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleSourceOuterClass.java index e74106c..5cadec1 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleSourceOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleSourceOuterClass.java @@ -167,7 +167,7 @@ public final class RogueMiracleSourceOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return RogueMiracleSourceConverter.INSTANCE; } @@ -189,7 +189,7 @@ public final class RogueMiracleSourceOuterClass { return value == null ? other : value; } - enum RogueMiracleSourceConverter implements EnumConverter { + enum RogueMiracleSourceConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final RogueMiracleSource[] lookup = new RogueMiracleSource[13]; diff --git a/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java index a6239a6..c967476 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class RogueNpcDisappearCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 disappear_npc_entity_id = 15; + * optional uint32 disappear_npc_entity_id = 11; */ private int disappearNpcEntityId; @@ -34,7 +34,7 @@ public final class RogueNpcDisappearCsReqOuterClass { } /** - * optional uint32 disappear_npc_entity_id = 15; + * optional uint32 disappear_npc_entity_id = 11; * @return whether the disappearNpcEntityId field is set */ public boolean hasDisappearNpcEntityId() { @@ -42,7 +42,7 @@ public final class RogueNpcDisappearCsReqOuterClass { } /** - * optional uint32 disappear_npc_entity_id = 15; + * optional uint32 disappear_npc_entity_id = 11; * @return this */ public RogueNpcDisappearCsReq clearDisappearNpcEntityId() { @@ -52,7 +52,7 @@ public final class RogueNpcDisappearCsReqOuterClass { } /** - * optional uint32 disappear_npc_entity_id = 15; + * optional uint32 disappear_npc_entity_id = 11; * @return the disappearNpcEntityId */ public int getDisappearNpcEntityId() { @@ -60,7 +60,7 @@ public final class RogueNpcDisappearCsReqOuterClass { } /** - * optional uint32 disappear_npc_entity_id = 15; + * optional uint32 disappear_npc_entity_id = 11; * @param value the disappearNpcEntityId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueNpcDisappearCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(disappearNpcEntityId); } } @@ -150,7 +150,7 @@ public final class RogueNpcDisappearCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 88: { // disappearNpcEntityId disappearNpcEntityId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearScRspOuterClass.java index bc31e46..7fd8fbc 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearScRspOuterClass.java @@ -19,7 +19,7 @@ public final class RogueNpcDisappearScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 9; */ private int retcode; @@ -34,7 +34,7 @@ public final class RogueNpcDisappearScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -42,7 +42,7 @@ public final class RogueNpcDisappearScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 9; * @return this */ public RogueNpcDisappearScRsp clearRetcode() { @@ -52,7 +52,7 @@ public final class RogueNpcDisappearScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -60,7 +60,7 @@ public final class RogueNpcDisappearScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueNpcDisappearScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } } @@ -150,7 +150,7 @@ public final class RogueNpcDisappearScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java index 0a90ba2..ee3d432 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java @@ -19,22 +19,22 @@ public final class RogueRecordAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 13; - */ - private int level; - - /** - * optional uint32 slot = 14; - */ - private int slot; - - /** - * optional uint32 id = 15; + * optional uint32 id = 1; */ private int id; /** - * optional .AvatarType avatar_type = 9; + * optional uint32 level = 4; + */ + private int level; + + /** + * optional uint32 slot = 13; + */ + private int slot; + + /** + * optional .AvatarType avatar_type = 11; */ private int avatarType; @@ -49,99 +49,25 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 level = 13; - * @return whether the level field is set + * optional uint32 id = 1; + * @return whether the id field is set */ - public boolean hasLevel() { + public boolean hasId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 level = 13; - * @return this - */ - public RogueRecordAvatar clearLevel() { - bitField0_ &= ~0x00000001; - 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 RogueRecordAvatar setLevel(final int value) { - bitField0_ |= 0x00000001; - level = value; - return this; - } - - /** - * 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 RogueRecordAvatar 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 RogueRecordAvatar setSlot(final int value) { - bitField0_ |= 0x00000002; - slot = value; - return this; - } - - /** - * optional uint32 id = 15; - * @return whether the id field is set - */ - public boolean hasId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 id = 15; + * optional uint32 id = 1; * @return this */ public RogueRecordAvatar clearId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; id = 0; return this; } /** - * optional uint32 id = 15; + * optional uint32 id = 1; * @return the id */ public int getId() { @@ -149,18 +75,92 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 id = 15; + * optional uint32 id = 1; * @param value the id to set * @return this */ public RogueRecordAvatar setId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; id = value; return this; } /** - * optional .AvatarType avatar_type = 9; + * optional uint32 level = 4; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 level = 4; + * @return this + */ + public RogueRecordAvatar clearLevel() { + bitField0_ &= ~0x00000002; + level = 0; + return this; + } + + /** + * optional uint32 level = 4; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 4; + * @param value the level to set + * @return this + */ + public RogueRecordAvatar setLevel(final int value) { + bitField0_ |= 0x00000002; + level = value; + return this; + } + + /** + * optional uint32 slot = 13; + * @return whether the slot field is set + */ + public boolean hasSlot() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 slot = 13; + * @return this + */ + public RogueRecordAvatar clearSlot() { + bitField0_ &= ~0x00000004; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 13; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 13; + * @param value the slot to set + * @return this + */ + public RogueRecordAvatar setSlot(final int value) { + bitField0_ |= 0x00000004; + slot = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 11; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -168,7 +168,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 9; + * optional .AvatarType avatar_type = 11; * @return this */ public RogueRecordAvatar clearAvatarType() { @@ -178,7 +178,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 9; + * optional .AvatarType avatar_type = 11; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -211,7 +211,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 9; + * optional .AvatarType avatar_type = 11; * @param value the avatarType to set * @return this */ @@ -226,9 +226,9 @@ public final class RogueRecordAvatarOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + id = other.id; level = other.level; slot = other.slot; - id = other.id; avatarType = other.avatarType; } return this; @@ -240,15 +240,15 @@ public final class RogueRecordAvatarOuterClass { return this; } cachedSize = -1; + if (other.hasId()) { + setId(other.id); + } if (other.hasLevel()) { setLevel(other.level); } if (other.hasSlot()) { setSlot(other.slot); } - if (other.hasId()) { - setId(other.id); - } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } @@ -262,9 +262,9 @@ public final class RogueRecordAvatarOuterClass { } cachedSize = -1; bitField0_ = 0; + id = 0; level = 0; slot = 0; - id = 0; avatarType = 0; return this; } @@ -289,28 +289,28 @@ public final class RogueRecordAvatarOuterClass { } RogueRecordAvatar other = (RogueRecordAvatar) o; return bitField0_ == other.bitField0_ + && (!hasId() || id == other.id) && (!hasLevel() || level == other.level) && (!hasSlot() || slot == other.slot) - && (!hasId() || id == other.id) && (!hasAvatarType() || avatarType == other.avatarType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(slot); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(id); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(slot); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeEnumNoTag(avatarType); } } @@ -319,13 +319,13 @@ public final class RogueRecordAvatarOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -340,34 +340,34 @@ public final class RogueRecordAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // slot - slot = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 8: { // id id = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 32) { break; } } - case 72: { + case 32: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // slot + slot = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -397,13 +397,13 @@ public final class RogueRecordAvatarOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -418,11 +418,22 @@ public final class RogueRecordAvatarOuterClass { } 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 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -433,17 +444,6 @@ public final class RogueRecordAvatarOuterClass { if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { slot = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3355: { - if (input.isAtField(FieldNames.id)) { - if (!input.trySkipNullValue()) { - id = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -521,12 +521,12 @@ public final class RogueRecordAvatarOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName id = FieldName.forField("id"); + static final FieldName level = FieldName.forField("level"); static final FieldName slot = FieldName.forField("slot"); - static final FieldName id = FieldName.forField("id"); - static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java index 581f478..af3d642 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java @@ -21,17 +21,17 @@ public final class RogueRecordInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 rogue_miracle_list = 10; + * repeated uint32 rogue_miracle_list = 8; */ private final RepeatedInt rogueMiracleList = RepeatedInt.newEmptyInstance(); /** - * repeated .RogueRecordAvatar avatar_list = 6; + * repeated .RogueRecordAvatar avatar_list = 7; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(RogueRecordAvatarOuterClass.RogueRecordAvatar.getFactory()); /** - * repeated .RogueBuff buff_list = 15; + * repeated .RogueBuff buff_list = 9; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(RogueBuffOuterClass.RogueBuff.getFactory()); @@ -46,7 +46,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 10; + * repeated uint32 rogue_miracle_list = 8; * @return whether the rogueMiracleList field is set */ public boolean hasRogueMiracleList() { @@ -54,7 +54,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 10; + * repeated uint32 rogue_miracle_list = 8; * @return this */ public RogueRecordInfo clearRogueMiracleList() { @@ -64,7 +64,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 10; + * repeated uint32 rogue_miracle_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -78,7 +78,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 10; + * repeated uint32 rogue_miracle_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -92,7 +92,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 10; + * repeated uint32 rogue_miracle_list = 8; * @param value the rogueMiracleList to add * @return this */ @@ -103,7 +103,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 10; + * repeated uint32 rogue_miracle_list = 8; * @param values the rogueMiracleList to add * @return this */ @@ -114,7 +114,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 6; + * repeated .RogueRecordAvatar avatar_list = 7; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -122,7 +122,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 6; + * repeated .RogueRecordAvatar avatar_list = 7; * @return this */ public RogueRecordInfo clearAvatarList() { @@ -132,7 +132,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 6; + * repeated .RogueRecordAvatar avatar_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -146,7 +146,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 6; + * repeated .RogueRecordAvatar avatar_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -160,7 +160,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 6; + * repeated .RogueRecordAvatar avatar_list = 7; * @param value the avatarList to add * @return this */ @@ -172,7 +172,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 6; + * repeated .RogueRecordAvatar avatar_list = 7; * @param values the avatarList to add * @return this */ @@ -184,7 +184,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 15; + * repeated .RogueBuff buff_list = 9; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -192,7 +192,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 15; + * repeated .RogueBuff buff_list = 9; * @return this */ public RogueRecordInfo clearBuffList() { @@ -202,7 +202,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 15; + * repeated .RogueBuff buff_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -216,7 +216,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 15; + * repeated .RogueBuff buff_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -230,7 +230,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 15; + * repeated .RogueBuff buff_list = 9; * @param value the buffList to add * @return this */ @@ -241,7 +241,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 15; + * repeated .RogueBuff buff_list = 9; * @param values the buffList to add * @return this */ @@ -326,19 +326,19 @@ public final class RogueRecordInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < rogueMiracleList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(rogueMiracleList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 58); output.writeMessageNoTag(avatarList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 74); output.writeMessageNoTag(buffList.get(i)); } } @@ -366,24 +366,24 @@ public final class RogueRecordInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 66: { // rogueMiracleList [packed=true] input.readPackedUInt32(rogueMiracleList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 58) { break; } } - case 50: { + case 58: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000002; - if (tag != 122) { + if (tag != 74) { break; } } - case 122: { + case 74: { // buffList tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000004; @@ -401,7 +401,7 @@ public final class RogueRecordInfoOuterClass { tag = input.readTag(); break; } - case 80: { + case 64: { // rogueMiracleList [packed=false] tag = input.readRepeatedUInt32(rogueMiracleList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java index c44e9f2..ba4b728 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java @@ -19,7 +19,7 @@ public final class RogueRerollBuffOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 7; + * optional .RogueCommonBuffSelectInfo buff_select_info = 9; */ private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); @@ -34,7 +34,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 7; + * optional .RogueCommonBuffSelectInfo buff_select_info = 9; * @return whether the buffSelectInfo field is set */ public boolean hasBuffSelectInfo() { @@ -42,7 +42,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 7; + * optional .RogueCommonBuffSelectInfo buff_select_info = 9; * @return this */ public RogueRerollBuff clearBuffSelectInfo() { @@ -52,7 +52,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 7; + * optional .RogueCommonBuffSelectInfo buff_select_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 RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 7; + * optional .RogueCommonBuffSelectInfo buff_select_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 @@ -81,7 +81,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 7; + * optional .RogueCommonBuffSelectInfo buff_select_info = 9; * @param value the buffSelectInfo to set * @return this */ @@ -152,7 +152,7 @@ public final class RogueRerollBuffOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 74); output.writeMessageNoTag(buffSelectInfo); } } @@ -173,7 +173,7 @@ public final class RogueRerollBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 74: { // buffSelectInfo input.readMessage(buffSelectInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java index 00a9f17..ce342c8 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java @@ -19,22 +19,22 @@ public final class RogueRoomOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 site_id = 1; - */ - private int siteId; - - /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 7; */ private int roomId; + /** + * optional uint32 site_id = 12; + */ + private int siteId; + /** * 
-     *  uint32 MGAHHMCOGKK = 14;
-     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
+     *  uint32 MGAHHMCOGKK = 10;
+     *  RogueRoomStatus GCLIKAAOKJL = 8; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 11; */ private int roomStatus; @@ -49,62 +49,25 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 1; - * @return whether the siteId field is set + * optional uint32 room_id = 7; + * @return whether the roomId field is set */ - public boolean hasSiteId() { + public boolean hasRoomId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 site_id = 1; - * @return this - */ - public RogueRoom clearSiteId() { - bitField0_ &= ~0x00000001; - siteId = 0; - return this; - } - - /** - * optional uint32 site_id = 1; - * @return the siteId - */ - public int getSiteId() { - return siteId; - } - - /** - * optional uint32 site_id = 1; - * @param value the siteId to set - * @return this - */ - public RogueRoom setSiteId(final int value) { - bitField0_ |= 0x00000001; - siteId = value; - return this; - } - - /** - * optional uint32 room_id = 12; - * @return whether the roomId field is set - */ - public boolean hasRoomId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 7; * @return this */ public RogueRoom clearRoomId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; roomId = 0; return this; } /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 7; * @return the roomId */ public int getRoomId() { @@ -112,23 +75,60 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 7; * @param value the roomId to set * @return this */ public RogueRoom setRoomId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; roomId = value; return this; } + /** + * optional uint32 site_id = 12; + * @return whether the siteId field is set + */ + public boolean hasSiteId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 site_id = 12; + * @return this + */ + public RogueRoom clearSiteId() { + bitField0_ &= ~0x00000002; + siteId = 0; + return this; + } + + /** + * optional uint32 site_id = 12; + * @return the siteId + */ + public int getSiteId() { + return siteId; + } + + /** + * optional uint32 site_id = 12; + * @param value the siteId to set + * @return this + */ + public RogueRoom setSiteId(final int value) { + bitField0_ |= 0x00000002; + siteId = value; + return this; + } + /** * 
-     *  uint32 MGAHHMCOGKK = 14;
-     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
+     *  uint32 MGAHHMCOGKK = 10;
+     *  RogueRoomStatus GCLIKAAOKJL = 8; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 11; * @return whether the roomStatus field is set */ public boolean hasRoomStatus() { @@ -137,11 +137,11 @@ public final class RogueRoomOuterClass { /** * 
-     *  uint32 MGAHHMCOGKK = 14;
-     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
+     *  uint32 MGAHHMCOGKK = 10;
+     *  RogueRoomStatus GCLIKAAOKJL = 8; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 11; * @return this */ public RogueRoom clearRoomStatus() { @@ -152,11 +152,11 @@ public final class RogueRoomOuterClass { /** * 
-     *  uint32 MGAHHMCOGKK = 14;
-     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
+     *  uint32 MGAHHMCOGKK = 10;
+     *  RogueRoomStatus GCLIKAAOKJL = 8; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 11; * @return the roomStatus */ public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() { @@ -190,11 +190,11 @@ public final class RogueRoomOuterClass { /** * 
-     *  uint32 MGAHHMCOGKK = 14;
-     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
+     *  uint32 MGAHHMCOGKK = 10;
+     *  RogueRoomStatus GCLIKAAOKJL = 8; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 11; * @param value the roomStatus to set * @return this */ @@ -209,8 +209,8 @@ public final class RogueRoomOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - siteId = other.siteId; roomId = other.roomId; + siteId = other.siteId; roomStatus = other.roomStatus; } return this; @@ -222,12 +222,12 @@ public final class RogueRoomOuterClass { return this; } cachedSize = -1; - if (other.hasSiteId()) { - setSiteId(other.siteId); - } if (other.hasRoomId()) { setRoomId(other.roomId); } + if (other.hasSiteId()) { + setSiteId(other.siteId); + } if (other.hasRoomStatus()) { setRoomStatusValue(other.roomStatus); } @@ -241,8 +241,8 @@ public final class RogueRoomOuterClass { } cachedSize = -1; bitField0_ = 0; - siteId = 0; roomId = 0; + siteId = 0; roomStatus = 0; return this; } @@ -267,23 +267,23 @@ public final class RogueRoomOuterClass { } RogueRoom other = (RogueRoom) o; return bitField0_ == other.bitField0_ - && (!hasSiteId() || siteId == other.siteId) && (!hasRoomId() || roomId == other.roomId) + && (!hasSiteId() || siteId == other.siteId) && (!hasRoomStatus() || roomStatus == other.roomStatus); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(siteId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(roomId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(roomId); + output.writeUInt32NoTag(siteId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeEnumNoTag(roomStatus); } } @@ -292,10 +292,10 @@ public final class RogueRoomOuterClass { 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); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(roomStatus); @@ -310,9 +310,9 @@ public final class RogueRoomOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // siteId - siteId = input.readUInt32(); + case 56: { + // roomId + roomId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 96) { @@ -320,15 +320,15 @@ public final class RogueRoomOuterClass { } } case 96: { - // roomId - roomId = input.readUInt32(); + // siteId + siteId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 88) { break; } } - case 80: { + case 88: { // roomStatus final int value = input.readInt32(); if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) { @@ -358,10 +358,10 @@ public final class RogueRoomOuterClass { 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); } if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.roomStatus, roomStatus, RogueRoomStatusOuterClass.RogueRoomStatus.converter()); @@ -376,11 +376,11 @@ public final class RogueRoomOuterClass { } 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 { @@ -388,11 +388,11 @@ public final class RogueRoomOuterClass { } 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 { @@ -469,10 +469,10 @@ public final class RogueRoomOuterClass { * 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"); + static final FieldName roomStatus = FieldName.forField("roomStatus", "room_status"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueRoomStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRoomStatusOuterClass.java index 4707342..5011a2a 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRoomStatusOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRoomStatusOuterClass.java @@ -87,7 +87,7 @@ public final class RogueRoomStatusOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return RogueRoomStatusConverter.INSTANCE; } @@ -109,7 +109,7 @@ public final class RogueRoomStatusOuterClass { return value == null ? other : value; } - enum RogueRoomStatusConverter implements EnumConverter { + enum RogueRoomStatusConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final RogueRoomStatus[] lookup = new RogueRoomStatus[5]; diff --git a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java index f8c3a0e..f53ca3e 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java @@ -21,40 +21,44 @@ public final class RogueScoreRewardInfoOuterClass { /** * 
-     *  FEDDDLLKOLI
+     *  ICPLHHGHKOL
      *
* - * optional int64 begin_time = 1; - */ - private long beginTime; - - /** - * optional int64 end_time = 10; + * optional int64 end_time = 4; */ private long endTime; /** - * optional uint32 pool_id = 4; + * 
+     *  HLMEJKCAFBP
+     *
+ * + * optional int64 begin_time = 15; */ - private int poolId; + private long beginTime; /** - * optional uint32 score = 12; + * optional uint32 score = 6; */ private int score; /** - * optional bool has_taken_initial_score = 7; + * optional uint32 pool_id = 8; + */ + private int poolId; + + /** + * optional bool has_taken_initial_score = 10; */ private boolean hasTakenInitialScore; /** - * optional bool pool_refreshed = 15; + * optional bool pool_refreshed = 14; */ private boolean poolRefreshed; /** - * repeated uint32 has_taken_reward = 13; + * repeated uint32 has_taken_reward = 7; */ private final RepeatedInt hasTakenReward = RepeatedInt.newEmptyInstance(); @@ -70,36 +74,89 @@ public final class RogueScoreRewardInfoOuterClass { /** * 
-     *  FEDDDLLKOLI
+     *  ICPLHHGHKOL
      *
* - * optional int64 begin_time = 1; - * @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; } /** * 
-     *  FEDDDLLKOLI
+     *  ICPLHHGHKOL
      *
* - * optional int64 begin_time = 1; + * optional int64 end_time = 4; + * @return this + */ + public RogueScoreRewardInfo clearEndTime() { + bitField0_ &= ~0x00000001; + endTime = 0L; + return this; + } + + /** + * 
+     *  ICPLHHGHKOL
+     *
+ * + * optional int64 end_time = 4; + * @return the endTime + */ + public long getEndTime() { + return endTime; + } + + /** + * 
+     *  ICPLHHGHKOL
+     *
+ * + * optional int64 end_time = 4; + * @param value the endTime to set + * @return this + */ + public RogueScoreRewardInfo setEndTime(final long value) { + bitField0_ |= 0x00000001; + endTime = value; + return this; + } + + /** + * 
+     *  HLMEJKCAFBP
+     *
+ * + * optional int64 begin_time = 15; + * @return whether the beginTime field is set + */ + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     *  HLMEJKCAFBP
+     *
+ * + * optional int64 begin_time = 15; * @return this */ public RogueScoreRewardInfo clearBeginTime() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; beginTime = 0L; return this; } /** * 
-     *  FEDDDLLKOLI
+     *  HLMEJKCAFBP
      *
* - * optional int64 begin_time = 1; + * optional int64 begin_time = 15; * @return the beginTime */ public long getBeginTime() { @@ -108,113 +165,39 @@ public final class RogueScoreRewardInfoOuterClass { /** * 
-     *  FEDDDLLKOLI
+     *  HLMEJKCAFBP
      *
* - * optional int64 begin_time = 1; + * optional int64 begin_time = 15; * @param value the beginTime to set * @return this */ public RogueScoreRewardInfo setBeginTime(final long value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; beginTime = value; return this; } /** - * optional int64 end_time = 10; - * @return whether the endTime field is set + * optional uint32 score = 6; + * @return whether the score field is set */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 10; - * @return this - */ - public RogueScoreRewardInfo clearEndTime() { - bitField0_ &= ~0x00000002; - endTime = 0L; - return this; - } - - /** - * optional int64 end_time = 10; - * @return the endTime - */ - public long getEndTime() { - return endTime; - } - - /** - * optional int64 end_time = 10; - * @param value the endTime to set - * @return this - */ - public RogueScoreRewardInfo setEndTime(final long value) { - bitField0_ |= 0x00000002; - endTime = value; - return this; - } - - /** - * optional uint32 pool_id = 4; - * @return whether the poolId field is set - */ - public boolean hasPoolId() { + public boolean hasScore() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 pool_id = 4; - * @return this - */ - public RogueScoreRewardInfo clearPoolId() { - bitField0_ &= ~0x00000004; - poolId = 0; - return this; - } - - /** - * optional uint32 pool_id = 4; - * @return the poolId - */ - public int getPoolId() { - return poolId; - } - - /** - * optional uint32 pool_id = 4; - * @param value the poolId to set - * @return this - */ - public RogueScoreRewardInfo setPoolId(final int value) { - bitField0_ |= 0x00000004; - poolId = value; - return this; - } - - /** - * optional uint32 score = 12; - * @return whether the score field is set - */ - public boolean hasScore() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 score = 12; + * optional uint32 score = 6; * @return this */ public RogueScoreRewardInfo clearScore() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; score = 0; return this; } /** - * optional uint32 score = 12; + * optional uint32 score = 6; * @return the score */ public int getScore() { @@ -222,18 +205,55 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 12; + * optional uint32 score = 6; * @param value the score to set * @return this */ public RogueScoreRewardInfo setScore(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; score = value; return this; } /** - * optional bool has_taken_initial_score = 7; + * optional uint32 pool_id = 8; + * @return whether the poolId field is set + */ + public boolean hasPoolId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 pool_id = 8; + * @return this + */ + public RogueScoreRewardInfo clearPoolId() { + bitField0_ &= ~0x00000008; + poolId = 0; + return this; + } + + /** + * optional uint32 pool_id = 8; + * @return the poolId + */ + public int getPoolId() { + return poolId; + } + + /** + * optional uint32 pool_id = 8; + * @param value the poolId to set + * @return this + */ + public RogueScoreRewardInfo setPoolId(final int value) { + bitField0_ |= 0x00000008; + poolId = value; + return this; + } + + /** + * optional bool has_taken_initial_score = 10; * @return whether the hasTakenInitialScore field is set */ public boolean hasHasTakenInitialScore() { @@ -241,7 +261,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool has_taken_initial_score = 7; + * optional bool has_taken_initial_score = 10; * @return this */ public RogueScoreRewardInfo clearHasTakenInitialScore() { @@ -251,7 +271,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool has_taken_initial_score = 7; + * optional bool has_taken_initial_score = 10; * @return the hasTakenInitialScore */ public boolean getHasTakenInitialScore() { @@ -259,7 +279,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool has_taken_initial_score = 7; + * optional bool has_taken_initial_score = 10; * @param value the hasTakenInitialScore to set * @return this */ @@ -270,7 +290,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool pool_refreshed = 15; + * optional bool pool_refreshed = 14; * @return whether the poolRefreshed field is set */ public boolean hasPoolRefreshed() { @@ -278,7 +298,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool pool_refreshed = 15; + * optional bool pool_refreshed = 14; * @return this */ public RogueScoreRewardInfo clearPoolRefreshed() { @@ -288,7 +308,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool pool_refreshed = 15; + * optional bool pool_refreshed = 14; * @return the poolRefreshed */ public boolean getPoolRefreshed() { @@ -296,7 +316,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool pool_refreshed = 15; + * optional bool pool_refreshed = 14; * @param value the poolRefreshed to set * @return this */ @@ -307,7 +327,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 13; + * repeated uint32 has_taken_reward = 7; * @return whether the hasTakenReward field is set */ public boolean hasHasTakenReward() { @@ -315,7 +335,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 13; + * repeated uint32 has_taken_reward = 7; * @return this */ public RogueScoreRewardInfo clearHasTakenReward() { @@ -325,7 +345,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 13; + * repeated uint32 has_taken_reward = 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. @@ -339,7 +359,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 13; + * repeated uint32 has_taken_reward = 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 @@ -353,7 +373,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 13; + * repeated uint32 has_taken_reward = 7; * @param value the hasTakenReward to add * @return this */ @@ -364,7 +384,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 13; + * repeated uint32 has_taken_reward = 7; * @param values the hasTakenReward to add * @return this */ @@ -379,10 +399,10 @@ public final class RogueScoreRewardInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; - poolId = other.poolId; + beginTime = other.beginTime; score = other.score; + poolId = other.poolId; hasTakenInitialScore = other.hasTakenInitialScore; poolRefreshed = other.poolRefreshed; hasTakenReward.copyFrom(other.hasTakenReward); @@ -396,18 +416,18 @@ public final class RogueScoreRewardInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } - if (other.hasPoolId()) { - setPoolId(other.poolId); + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); } if (other.hasScore()) { setScore(other.score); } + if (other.hasPoolId()) { + setPoolId(other.poolId); + } if (other.hasHasTakenInitialScore()) { setHasTakenInitialScore(other.hasTakenInitialScore); } @@ -427,10 +447,10 @@ public final class RogueScoreRewardInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; - poolId = 0; + beginTime = 0L; score = 0; + poolId = 0; hasTakenInitialScore = false; poolRefreshed = false; hasTakenReward.clear(); @@ -458,10 +478,10 @@ public final class RogueScoreRewardInfoOuterClass { } RogueScoreRewardInfo other = (RogueScoreRewardInfo) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) - && (!hasPoolId() || poolId == other.poolId) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasScore() || score == other.score) + && (!hasPoolId() || poolId == other.poolId) && (!hasHasTakenInitialScore() || hasTakenInitialScore == other.hasTakenInitialScore) && (!hasPoolRefreshed() || poolRefreshed == other.poolRefreshed) && (!hasHasTakenReward() || hasTakenReward.equals(other.hasTakenReward)); @@ -470,32 +490,32 @@ public final class RogueScoreRewardInfoOuterClass { @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) 80); + output.writeRawByte((byte) 32); output.writeInt64NoTag(endTime); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(poolId); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeInt64NoTag(beginTime); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 48); output.writeUInt32NoTag(score); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(poolId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 80); output.writeBoolNoTag(hasTakenInitialScore); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeBoolNoTag(poolRefreshed); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < hasTakenReward.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(hasTakenReward.array()[i]); } } @@ -505,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(poolId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + size += 1 + ProtoSink.computeUInt32SizeNoTag(poolId); } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -535,61 +555,61 @@ public final class RogueScoreRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 32: { // endTime endTime = input.readInt64(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // poolId - poolId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // score - score = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // hasTakenInitialScore - hasTakenInitialScore = input.readBool(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { break; } } case 120: { + // beginTime + beginTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // score + score = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // poolId + poolId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // hasTakenInitialScore + hasTakenInitialScore = input.readBool(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { // poolRefreshed poolRefreshed = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 106) { + if (tag != 58) { break; } } - case 106: { + case 58: { // hasTakenReward [packed=true] input.readPackedUInt32(hasTakenReward, tag); bitField0_ |= 0x00000040; @@ -608,7 +628,7 @@ public final class RogueScoreRewardInfoOuterClass { tag = input.readTag(); break; } - case 104: { + case 56: { // hasTakenReward [packed=false] tag = input.readRepeatedUInt32(hasTakenReward, tag); bitField0_ |= 0x00000040; @@ -622,16 +642,16 @@ 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_ & 0x00000002) != 0) { + output.writeInt64(FieldNames.beginTime, beginTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.poolId, poolId); + output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.score, score); + output.writeUInt32(FieldNames.poolId, poolId); } if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.hasTakenInitialScore, hasTakenInitialScore); @@ -652,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 { @@ -664,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 { @@ -676,22 +696,22 @@ 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_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 109264530: { - if (input.isAtField(FieldNames.score)) { - if (!input.trySkipNullValue()) { - score = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -788,14 +808,14 @@ 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 poolId = FieldName.forField("poolId", "pool_id"); + static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); static final FieldName score = FieldName.forField("score"); + static final FieldName poolId = FieldName.forField("poolId", "pool_id"); + static final FieldName hasTakenInitialScore = FieldName.forField("hasTakenInitialScore", "has_taken_initial_score"); static final FieldName poolRefreshed = FieldName.forField("poolRefreshed", "pool_refreshed"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java index b77d62e..f216cff 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java @@ -24,12 +24,12 @@ public final class RogueSeasonInfoOuterClass { private long beginTime; /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; */ private long endTime; /** - * optional uint32 season_id = 3; + * optional uint32 season_id = 5; */ private int seasonId; @@ -81,7 +81,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -89,7 +89,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; * @return this */ public RogueSeasonInfo clearEndTime() { @@ -99,7 +99,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; * @return the endTime */ public long getEndTime() { @@ -107,7 +107,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; * @param value the endTime to set * @return this */ @@ -118,7 +118,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 3; + * 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 = 3; + * optional uint32 season_id = 5; * @return this */ public RogueSeasonInfo clearSeasonId() { @@ -136,7 +136,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 3; + * optional uint32 season_id = 5; * @return the seasonId */ public int getSeasonId() { @@ -144,7 +144,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 3; + * optional uint32 season_id = 5; * @param value the seasonId to set * @return this */ @@ -229,11 +229,11 @@ public final class RogueSeasonInfoOuterClass { output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 56); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(seasonId); } } @@ -265,20 +265,20 @@ public final class RogueSeasonInfoOuterClass { beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { + case 56: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 40) { break; } } - case 24: { + case 40: { // seasonId seasonId = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueStatusOuterClass.java index c9d079c..d89fdde 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueStatusOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueStatusOuterClass.java @@ -87,7 +87,7 @@ public final class RogueStatusOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return RogueStatusConverter.INSTANCE; } @@ -109,7 +109,7 @@ public final class RogueStatusOuterClass { return value == null ? other : value; } - enum RogueStatusConverter implements EnumConverter { + enum RogueStatusConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final RogueStatus[] lookup = new RogueStatus[5]; diff --git a/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java index 4c78b58..935fac2 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java @@ -18,16 +18,16 @@ public final class RogueSyncContextBoardEventOuterClass { public static final class RogueSyncContextBoardEvent extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 modifier_effect_type = 3; - */ - private int modifierEffectType; - /** * optional uint32 board_event_id = 7; */ private int boardEventId; + /** + * optional uint32 modifier_effect_type = 9; + */ + private int modifierEffectType; + private RogueSyncContextBoardEvent() { } @@ -38,49 +38,12 @@ public final class RogueSyncContextBoardEventOuterClass { return new RogueSyncContextBoardEvent(); } - /** - * optional uint32 modifier_effect_type = 3; - * @return whether the modifierEffectType field is set - */ - public boolean hasModifierEffectType() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 modifier_effect_type = 3; - * @return this - */ - public RogueSyncContextBoardEvent clearModifierEffectType() { - bitField0_ &= ~0x00000001; - modifierEffectType = 0; - return this; - } - - /** - * optional uint32 modifier_effect_type = 3; - * @return the modifierEffectType - */ - public int getModifierEffectType() { - return modifierEffectType; - } - - /** - * optional uint32 modifier_effect_type = 3; - * @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 = 7; * @return whether the boardEventId field is set */ public boolean hasBoardEventId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -88,7 +51,7 @@ public final class RogueSyncContextBoardEventOuterClass { * @return this */ public RogueSyncContextBoardEvent clearBoardEventId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; boardEventId = 0; return this; } @@ -107,18 +70,55 @@ public final class RogueSyncContextBoardEventOuterClass { * @return this */ public RogueSyncContextBoardEvent setBoardEventId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; boardEventId = value; return this; } + /** + * optional uint32 modifier_effect_type = 9; + * @return whether the modifierEffectType field is set + */ + public boolean hasModifierEffectType() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 modifier_effect_type = 9; + * @return this + */ + public RogueSyncContextBoardEvent clearModifierEffectType() { + bitField0_ &= ~0x00000002; + modifierEffectType = 0; + return this; + } + + /** + * optional uint32 modifier_effect_type = 9; + * @return the modifierEffectType + */ + public int getModifierEffectType() { + return modifierEffectType; + } + + /** + * optional uint32 modifier_effect_type = 9; + * @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,30 +170,30 @@ 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) 24); - output.writeUInt32NoTag(modifierEffectType); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(boardEventId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(modifierEffectType); + } } @Override 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; } @@ -205,18 +205,18 @@ public final class RogueSyncContextBoardEventOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // modifierEffectType - modifierEffectType = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } case 56: { // boardEventId boardEventId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // 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 88821af..ede8372 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 = 7; + * repeated .RogueTalent rogue_talent = 15; */ private final RepeatedMessage rogueTalent = RepeatedMessage.newEmptyInstance(RogueTalentOuterClass.RogueTalent.getFactory()); @@ -35,7 +35,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 7; + * repeated .RogueTalent rogue_talent = 15; * @return whether the rogueTalent field is set */ public boolean hasRogueTalent() { @@ -43,7 +43,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 7; + * repeated .RogueTalent rogue_talent = 15; * @return this */ public RogueTalentInfo clearRogueTalent() { @@ -53,7 +53,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 7; + * repeated .RogueTalent rogue_talent = 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 RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 7; + * repeated .RogueTalent rogue_talent = 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 RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 7; + * repeated .RogueTalent rogue_talent = 15; * @param value the rogueTalent to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 7; + * repeated .RogueTalent rogue_talent = 15; * @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) 58); + output.writeRawByte((byte) 122); output.writeMessageNoTag(rogueTalent.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueTalentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 122: { // 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 f7f926a..9281003 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 = 5; */ private int talentId; /** - * optional .RogueTalentStatus status = 7; + * optional .RogueTalentStatus status = 15; */ private int status; /** - * repeated .RogueUnlockProgress unlock_progress_list = 5; + * repeated .RogueUnlockProgress unlock_progress_list = 6; */ 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 = 5; * @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 = 5; * @return this */ public RogueTalent clearTalentId() { @@ -63,7 +63,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 12; + * optional uint32 talent_id = 5; * @return the talentId */ public int getTalentId() { @@ -71,7 +71,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 12; + * optional uint32 talent_id = 5; * @param value the talentId to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 7; + * optional .RogueTalentStatus status = 15; * @return whether the status field is set */ public boolean hasStatus() { @@ -90,7 +90,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 7; + * optional .RogueTalentStatus status = 15; * @return this */ public RogueTalent clearStatus() { @@ -100,7 +100,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 7; + * optional .RogueTalentStatus status = 15; * @return the status */ public RogueTalentStatusOuterClass.RogueTalentStatus getStatus() { @@ -133,7 +133,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 7; + * optional .RogueTalentStatus status = 15; * @param value the status to set * @return this */ @@ -144,7 +144,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 5; + * repeated .RogueUnlockProgress unlock_progress_list = 6; * @return whether the unlockProgressList field is set */ public boolean hasUnlockProgressList() { @@ -152,7 +152,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 5; + * repeated .RogueUnlockProgress unlock_progress_list = 6; * @return this */ public RogueTalent clearUnlockProgressList() { @@ -162,7 +162,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 5; + * repeated .RogueUnlockProgress unlock_progress_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. @@ -177,7 +177,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 5; + * repeated .RogueUnlockProgress unlock_progress_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 @@ -192,7 +192,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 5; + * repeated .RogueUnlockProgress unlock_progress_list = 6; * @param value the unlockProgressList to add * @return this */ @@ -204,7 +204,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 5; + * repeated .RogueUnlockProgress unlock_progress_list = 6; * @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) 40); output.writeUInt32NoTag(talentId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < unlockProgressList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 50); output.writeMessageNoTag(unlockProgressList.get(i)); } } @@ -324,16 +324,16 @@ public final class RogueTalentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 40: { // talentId talentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 120) { break; } } - case 56: { + case 120: { // 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 != 42) { + if (tag != 50) { break; } } - case 42: { + case 50: { // unlockProgressList tag = input.readRepeatedMessage(unlockProgressList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueTalentStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueTalentStatusOuterClass.java index 25658e2..c3f22cb 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueTalentStatusOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueTalentStatusOuterClass.java @@ -67,7 +67,7 @@ public final class RogueTalentStatusOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return RogueTalentStatusConverter.INSTANCE; } @@ -89,7 +89,7 @@ public final class RogueTalentStatusOuterClass { return value == null ? other : value; } - enum RogueTalentStatusConverter implements EnumConverter { + enum RogueTalentStatusConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final RogueTalentStatus[] lookup = new RogueTalentStatus[3]; diff --git a/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java index d1722af..3610661 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 = 1; - */ - private int progress; - - /** - * optional uint32 unlock_id = 3; + * optional uint32 unlock_id = 4; */ private int unlockId; /** - * optional bool finish = 9; + * optional uint32 progress = 13; + */ + private int progress; + + /** + * optional bool finish = 5; */ private boolean finish; @@ -44,62 +44,25 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 progress = 1; - * @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 = 1; - * @return this - */ - public RogueUnlockProgress clearProgress() { - bitField0_ &= ~0x00000001; - 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 RogueUnlockProgress setProgress(final int value) { - bitField0_ |= 0x00000001; - progress = value; - return this; - } - - /** - * optional uint32 unlock_id = 3; - * @return whether the unlockId field is set - */ - public boolean hasUnlockId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 unlock_id = 3; + * optional uint32 unlock_id = 4; * @return this */ public RogueUnlockProgress clearUnlockId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; unlockId = 0; return this; } /** - * optional uint32 unlock_id = 3; + * optional uint32 unlock_id = 4; * @return the unlockId */ public int getUnlockId() { @@ -107,18 +70,55 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 unlock_id = 3; + * 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 = 9; + * optional uint32 progress = 13; + * @return whether the progress field is set + */ + public boolean hasProgress() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 progress = 13; + * @return this + */ + public RogueUnlockProgress clearProgress() { + bitField0_ &= ~0x00000002; + progress = 0; + return this; + } + + /** + * optional uint32 progress = 13; + * @return the progress + */ + public int getProgress() { + return progress; + } + + /** + * optional uint32 progress = 13; + * @param value the progress to set + * @return this + */ + public RogueUnlockProgress setProgress(final int value) { + bitField0_ |= 0x00000002; + progress = value; + return this; + } + + /** + * optional bool finish = 5; * @return whether the finish field is set */ public boolean hasFinish() { @@ -126,7 +126,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 9; + * optional bool finish = 5; * @return this */ public RogueUnlockProgress clearFinish() { @@ -136,7 +136,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 9; + * optional bool finish = 5; * @return the finish */ public boolean getFinish() { @@ -144,7 +144,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 9; + * optional bool finish = 5; * @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) 8); - output.writeUInt32NoTag(progress); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(unlockId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(progress); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 40); 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 8: { - // progress - progress = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { + case 32: { // unlockId unlockId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 104) { break; } } - case 72: { + case 104: { + // progress + progress = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // 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/RogueVirtualItemDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java index 2499f8e..c20db14 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java @@ -23,15 +23,15 @@ public final class RogueVirtualItemDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 display_type = 2; - */ - private int displayType; - - /** - * optional uint32 num = 14; + * optional uint32 num = 2; */ private int num; + /** + * optional uint32 display_type = 6; + */ + private int displayType; + private RogueVirtualItemData() { } @@ -47,62 +47,25 @@ public final class RogueVirtualItemDataOuterClass { } /** - * optional uint32 display_type = 2; - * @return whether the displayType field is set + * optional uint32 num = 2; + * @return whether the num field is set */ - public boolean hasDisplayType() { + public boolean hasNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 display_type = 2; - * @return this - */ - public RogueVirtualItemData clearDisplayType() { - bitField0_ &= ~0x00000001; - displayType = 0; - return this; - } - - /** - * optional uint32 display_type = 2; - * @return the displayType - */ - public int getDisplayType() { - return displayType; - } - - /** - * optional uint32 display_type = 2; - * @param value the displayType to set - * @return this - */ - public RogueVirtualItemData setDisplayType(final int value) { - bitField0_ |= 0x00000001; - displayType = value; - return this; - } - - /** - * optional uint32 num = 14; - * @return whether the num field is set - */ - public boolean hasNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 num = 14; + * optional uint32 num = 2; * @return this */ public RogueVirtualItemData clearNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; num = 0; return this; } /** - * optional uint32 num = 14; + * optional uint32 num = 2; * @return the num */ public int getNum() { @@ -110,23 +73,60 @@ public final class RogueVirtualItemDataOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 2; * @param value the num to set * @return this */ public RogueVirtualItemData setNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; num = value; return this; } + /** + * optional uint32 display_type = 6; + * @return whether the displayType field is set + */ + public boolean hasDisplayType() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 display_type = 6; + * @return this + */ + public RogueVirtualItemData clearDisplayType() { + bitField0_ &= ~0x00000002; + displayType = 0; + return this; + } + + /** + * optional uint32 display_type = 6; + * @return the displayType + */ + public int getDisplayType() { + return displayType; + } + + /** + * optional uint32 display_type = 6; + * @param value the displayType to set + * @return this + */ + public RogueVirtualItemData setDisplayType(final int value) { + bitField0_ |= 0x00000002; + displayType = value; + return this; + } + @Override public RogueVirtualItemData copyFrom(final RogueVirtualItemData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - displayType = other.displayType; num = other.num; + displayType = other.displayType; } return this; } @@ -137,12 +137,12 @@ public final class RogueVirtualItemDataOuterClass { return this; } cachedSize = -1; - if (other.hasDisplayType()) { - setDisplayType(other.displayType); - } if (other.hasNum()) { setNum(other.num); } + if (other.hasDisplayType()) { + setDisplayType(other.displayType); + } return this; } @@ -153,8 +153,8 @@ public final class RogueVirtualItemDataOuterClass { } cachedSize = -1; bitField0_ = 0; - displayType = 0; num = 0; + displayType = 0; return this; } @@ -178,19 +178,19 @@ public final class RogueVirtualItemDataOuterClass { } RogueVirtualItemData other = (RogueVirtualItemData) o; return bitField0_ == other.bitField0_ - && (!hasDisplayType() || displayType == other.displayType) - && (!hasNum() || num == other.num); + && (!hasNum() || num == other.num) + && (!hasDisplayType() || displayType == other.displayType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(displayType); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(displayType); } } @@ -198,10 +198,10 @@ public final class RogueVirtualItemDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(displayType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(displayType); } return size; } @@ -214,17 +214,17 @@ public final class RogueVirtualItemDataOuterClass { while (true) { switch (tag) { case 16: { - // displayType - displayType = input.readUInt32(); + // num + num = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 48) { break; } } - case 112: { - // num - num = input.readUInt32(); + case 48: { + // displayType + displayType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -249,10 +249,10 @@ public final class RogueVirtualItemDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.displayType, displayType); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.displayType, displayType); } output.endObject(); } @@ -264,11 +264,10 @@ public final class RogueVirtualItemDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1714350876: - case 1615288471: { - if (input.isAtField(FieldNames.displayType)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - displayType = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -276,10 +275,11 @@ public final class RogueVirtualItemDataOuterClass { } break; } - case 109446: { - if (input.isAtField(FieldNames.num)) { + case 1714350876: + case 1615288471: { + if (input.isAtField(FieldNames.displayType)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + displayType = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -340,9 +340,9 @@ public final class RogueVirtualItemDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName displayType = FieldName.forField("displayType", "display_type"); - static final FieldName num = FieldName.forField("num"); + + static final FieldName displayType = FieldName.forField("displayType", "display_type"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java index ec2f232..285bab4 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java @@ -20,10 +20,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  could be 5, 7 or 12
+     *  could be 1, 8 or 5
      *
* - * optional uint32 rogue_coin = 3; + * optional uint32 rogue_coin = 1; */ private int rogueCoin; @@ -39,10 +39,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  could be 5, 7 or 12
+     *  could be 1, 8 or 5
      *
* - * optional uint32 rogue_coin = 3; + * optional uint32 rogue_coin = 1; * @return whether the rogueCoin field is set */ public boolean hasRogueCoin() { @@ -51,10 +51,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  could be 5, 7 or 12
+     *  could be 1, 8 or 5
      *
* - * optional uint32 rogue_coin = 3; + * optional uint32 rogue_coin = 1; * @return this */ public RogueVirtualItemInfo clearRogueCoin() { @@ -65,10 +65,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  could be 5, 7 or 12
+     *  could be 1, 8 or 5
      *
* - * optional uint32 rogue_coin = 3; + * optional uint32 rogue_coin = 1; * @return the rogueCoin */ public int getRogueCoin() { @@ -77,10 +77,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  could be 5, 7 or 12
+     *  could be 1, 8 or 5
      *
* - * optional uint32 rogue_coin = 3; + * optional uint32 rogue_coin = 1; * @param value the rogueCoin to set * @return this */ @@ -149,7 +149,7 @@ public final class RogueVirtualItemInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(rogueCoin); } } @@ -170,7 +170,7 @@ public final class RogueVirtualItemInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 8: { // rogueCoin rogueCoin = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java index 8fc32bc..4519c16 100644 --- a/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java @@ -20,25 +20,25 @@ public final class RotateMapCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 4; - */ - private int groupId; - - /** - * optional uint32 unk_int = 5; + * optional uint32 unk_int = 2; */ private int unkInt; /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 12; + * optional uint32 group_id = 6; */ - private final NewMapRot rogueMap = NewMapRot.newInstance(); + private int groupId; /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 3; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + /** + * optional .RotateMapCsReq.NewMapRot rogue_map = 11; + */ + private final NewMapRot rogueMap = NewMapRot.newInstance(); + private RotateMapCsReq() { } @@ -50,62 +50,25 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 group_id = 4; - * @return whether the groupId field is set + * optional uint32 unk_int = 2; + * @return whether the unkInt field is set */ - public boolean hasGroupId() { + public boolean hasUnkInt() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 4; - * @return this - */ - public RotateMapCsReq clearGroupId() { - bitField0_ &= ~0x00000001; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 4; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 4; - * @param value the groupId to set - * @return this - */ - public RotateMapCsReq setGroupId(final int value) { - bitField0_ |= 0x00000001; - groupId = value; - return this; - } - - /** - * optional uint32 unk_int = 5; - * @return whether the unkInt field is set - */ - public boolean hasUnkInt() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 unk_int = 5; + * optional uint32 unk_int = 2; * @return this */ public RotateMapCsReq clearUnkInt() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; unkInt = 0; return this; } /** - * optional uint32 unk_int = 5; + * optional uint32 unk_int = 2; * @return the unkInt */ public int getUnkInt() { @@ -113,93 +76,73 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 unk_int = 5; + * optional uint32 unk_int = 2; * @param value the unkInt to set * @return this */ public RotateMapCsReq setUnkInt(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; unkInt = value; return this; } /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 12; - * @return whether the rogueMap field is set + * optional uint32 group_id = 6; + * @return whether the groupId field is set */ - public boolean hasRogueMap() { + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 6; + * @return this + */ + public RotateMapCsReq clearGroupId() { + bitField0_ &= ~0x00000002; + 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 RotateMapCsReq setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + + /** + * optional .MotionInfo motion = 3; + * @return whether the motion field is set + */ + public boolean hasMotion() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 12; - * @return this - */ - public RotateMapCsReq clearRogueMap() { - bitField0_ &= ~0x00000004; - rogueMap.clear(); - return this; - } - - /** - * 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. - * - * Use {@link #getMutableRogueMap()} if you want to modify it. - * - * @return internal storage object for reading - */ - public NewMapRot getRogueMap() { - return rogueMap; - } - - /** - * 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public NewMapRot getMutableRogueMap() { - bitField0_ |= 0x00000004; - return rogueMap; - } - - /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 12; - * @param value the rogueMap to set - * @return this - */ - public RotateMapCsReq setRogueMap(final NewMapRot value) { - bitField0_ |= 0x00000004; - rogueMap.copyFrom(value); - return this; - } - - /** - * optional .MotionInfo motion = 15; - * @return whether the motion field is set - */ - public boolean hasMotion() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 3; * @return this */ public RotateMapCsReq clearMotion() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; motion.clear(); return this; } /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 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. @@ -213,7 +156,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 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 @@ -222,30 +165,87 @@ public final class RotateMapCsReqOuterClass { * @return internal storage object for modifications */ public MotionInfoOuterClass.MotionInfo getMutableMotion() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return motion; } /** - * optional .MotionInfo motion = 15; + * optional .MotionInfo motion = 3; * @param value the motion to set * @return this */ public RotateMapCsReq setMotion(final MotionInfoOuterClass.MotionInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; motion.copyFrom(value); return this; } + /** + * optional .RotateMapCsReq.NewMapRot rogue_map = 11; + * @return whether the rogueMap field is set + */ + public boolean hasRogueMap() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RotateMapCsReq.NewMapRot rogue_map = 11; + * @return this + */ + public RotateMapCsReq clearRogueMap() { + bitField0_ &= ~0x00000008; + rogueMap.clear(); + return this; + } + + /** + * optional .RotateMapCsReq.NewMapRot rogue_map = 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 #getMutableRogueMap()} if you want to modify it. + * + * @return internal storage object for reading + */ + public NewMapRot getRogueMap() { + return rogueMap; + } + + /** + * optional .RotateMapCsReq.NewMapRot rogue_map = 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 NewMapRot getMutableRogueMap() { + bitField0_ |= 0x00000008; + return rogueMap; + } + + /** + * optional .RotateMapCsReq.NewMapRot rogue_map = 11; + * @param value the rogueMap to set + * @return this + */ + public RotateMapCsReq setRogueMap(final NewMapRot value) { + bitField0_ |= 0x00000008; + rogueMap.copyFrom(value); + return this; + } + @Override public RotateMapCsReq copyFrom(final RotateMapCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; unkInt = other.unkInt; - rogueMap.copyFrom(other.rogueMap); + groupId = other.groupId; motion.copyFrom(other.motion); + rogueMap.copyFrom(other.rogueMap); } return this; } @@ -256,18 +256,18 @@ public final class RotateMapCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasUnkInt()) { setUnkInt(other.unkInt); } - if (other.hasRogueMap()) { - getMutableRogueMap().mergeFrom(other.rogueMap); + if (other.hasGroupId()) { + setGroupId(other.groupId); } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } + if (other.hasRogueMap()) { + getMutableRogueMap().mergeFrom(other.rogueMap); + } return this; } @@ -278,10 +278,10 @@ public final class RotateMapCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - groupId = 0; unkInt = 0; - rogueMap.clear(); + groupId = 0; motion.clear(); + rogueMap.clear(); return this; } @@ -292,8 +292,8 @@ public final class RotateMapCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueMap.clearQuick(); motion.clearQuick(); + rogueMap.clearQuick(); return this; } @@ -307,29 +307,29 @@ public final class RotateMapCsReqOuterClass { } RotateMapCsReq other = (RotateMapCsReq) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasUnkInt() || unkInt == other.unkInt) - && (!hasRogueMap() || rogueMap.equals(other.rogueMap)) - && (!hasMotion() || motion.equals(other.motion)); + && (!hasGroupId() || groupId == other.groupId) + && (!hasMotion() || motion.equals(other.motion)) + && (!hasRogueMap() || rogueMap.equals(other.rogueMap)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(groupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(unkInt); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(groupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(rogueMap); + output.writeRawByte((byte) 26); + output.writeMessageNoTag(motion); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(motion); + output.writeRawByte((byte) 90); + output.writeMessageNoTag(rogueMap); } } @@ -337,16 +337,16 @@ public final class RotateMapCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMap); + size += 1 + ProtoSink.computeMessageSizeNoTag(motion); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(motion); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMap); } return size; } @@ -358,36 +358,36 @@ public final class RotateMapCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // groupId - groupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 16: { // unkInt unkInt = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { + if (tag != 26) { break; } } - case 98: { - // rogueMap - input.readMessage(rogueMap); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { + case 26: { // motion input.readMessage(motion); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { + // rogueMap + input.readMessage(rogueMap); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -412,16 +412,16 @@ public final class RotateMapCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.unkInt, unkInt); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.groupId, groupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rogueMap, rogueMap); + output.writeMessage(FieldNames.motion, motion); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.motion, motion); + output.writeMessage(FieldNames.rogueMap, rogueMap); } output.endObject(); } @@ -433,11 +433,11 @@ public final class RotateMapCsReqOuterClass { } 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 { @@ -445,11 +445,11 @@ public final class RotateMapCsReqOuterClass { } 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 { @@ -457,22 +457,22 @@ public final class RotateMapCsReqOuterClass { } break; } + case -1068318794: { + if (input.isAtField(FieldNames.motion)) { + if (!input.trySkipNullValue()) { + input.readMessage(motion); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case -394483422: case 656463223: { if (input.isAtField(FieldNames.rogueMap)) { if (!input.trySkipNullValue()) { input.readMessage(rogueMap); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1068318794: { - if (input.isAtField(FieldNames.motion)) { - if (!input.trySkipNullValue()) { - input.readMessage(motion); bitField0_ |= 0x00000008; } } else { @@ -527,14 +527,14 @@ public final class RotateMapCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional float x = 7; + * optional float x = 10; */ private float x; /** - * optional float y = 9; + * optional float w = 11; */ - private float y; + private float w; /** * optional float z = 13; @@ -542,9 +542,9 @@ public final class RotateMapCsReqOuterClass { private float z; /** - * optional float w = 15; + * optional float y = 15; */ - private float w; + private float y; private Vector4() { } @@ -557,7 +557,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 7; + * optional float x = 10; * @return whether the x field is set */ public boolean hasX() { @@ -565,7 +565,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 7; + * optional float x = 10; * @return this */ public Vector4 clearX() { @@ -575,7 +575,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 7; + * optional float x = 10; * @return the x */ public float getX() { @@ -583,7 +583,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 7; + * optional float x = 10; * @param value the x to set * @return this */ @@ -594,39 +594,39 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float y = 9; - * @return whether the y field is set + * optional float w = 11; + * @return whether the w field is set */ - public boolean hasY() { + public boolean hasW() { return (bitField0_ & 0x00000002) != 0; } /** - * optional float y = 9; + * optional float w = 11; * @return this */ - public Vector4 clearY() { + public Vector4 clearW() { bitField0_ &= ~0x00000002; - y = 0F; + w = 0F; return this; } /** - * optional float y = 9; - * @return the y + * optional float w = 11; + * @return the w */ - public float getY() { - return y; + public float getW() { + return w; } /** - * optional float y = 9; - * @param value the y to set + * optional float w = 11; + * @param value the w to set * @return this */ - public Vector4 setY(final float value) { + public Vector4 setW(final float value) { bitField0_ |= 0x00000002; - y = value; + w = value; return this; } @@ -668,39 +668,39 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float w = 15; - * @return whether the w field is set + * optional float y = 15; + * @return whether the y field is set */ - public boolean hasW() { + public boolean hasY() { return (bitField0_ & 0x00000008) != 0; } /** - * optional float w = 15; + * optional float y = 15; * @return this */ - public Vector4 clearW() { + public Vector4 clearY() { bitField0_ &= ~0x00000008; - w = 0F; + y = 0F; return this; } /** - * optional float w = 15; - * @return the w + * optional float y = 15; + * @return the y */ - public float getW() { - return w; + public float getY() { + return y; } /** - * optional float w = 15; - * @param value the w to set + * optional float y = 15; + * @param value the y to set * @return this */ - public Vector4 setW(final float value) { + public Vector4 setY(final float value) { bitField0_ |= 0x00000008; - w = value; + y = value; return this; } @@ -710,9 +710,9 @@ public final class RotateMapCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; x = other.x; - y = other.y; - z = other.z; w = other.w; + z = other.z; + y = other.y; } return this; } @@ -726,14 +726,14 @@ public final class RotateMapCsReqOuterClass { if (other.hasX()) { setX(other.x); } - if (other.hasY()) { - setY(other.y); + if (other.hasW()) { + setW(other.w); } if (other.hasZ()) { setZ(other.z); } - if (other.hasW()) { - setW(other.w); + if (other.hasY()) { + setY(other.y); } return this; } @@ -746,9 +746,9 @@ public final class RotateMapCsReqOuterClass { cachedSize = -1; bitField0_ = 0; x = 0F; - y = 0F; - z = 0F; w = 0F; + z = 0F; + y = 0F; return this; } @@ -773,20 +773,20 @@ public final class RotateMapCsReqOuterClass { Vector4 other = (Vector4) o; return bitField0_ == other.bitField0_ && (!hasX() || ProtoUtil.isEqual(x, other.x)) - && (!hasY() || ProtoUtil.isEqual(y, other.y)) + && (!hasW() || ProtoUtil.isEqual(w, other.w)) && (!hasZ() || ProtoUtil.isEqual(z, other.z)) - && (!hasW() || ProtoUtil.isEqual(w, other.w)); + && (!hasY() || ProtoUtil.isEqual(y, other.y)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 61); + output.writeRawByte((byte) 85); output.writeFloatNoTag(x); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 77); - output.writeFloatNoTag(y); + output.writeRawByte((byte) 93); + output.writeFloatNoTag(w); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 109); @@ -794,7 +794,7 @@ public final class RotateMapCsReqOuterClass { } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 125); - output.writeFloatNoTag(w); + output.writeFloatNoTag(y); } } @@ -823,18 +823,18 @@ public final class RotateMapCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 61: { + case 85: { // x x = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 77) { + if (tag != 93) { break; } } - case 77: { - // y - y = input.readFloat(); + case 93: { + // w + w = input.readFloat(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 109) { @@ -851,8 +851,8 @@ public final class RotateMapCsReqOuterClass { } } case 125: { - // w - w = input.readFloat(); + // y + y = input.readFloat(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -880,13 +880,13 @@ public final class RotateMapCsReqOuterClass { output.writeFloat(FieldNames.x, x); } if ((bitField0_ & 0x00000002) != 0) { - output.writeFloat(FieldNames.y, y); + output.writeFloat(FieldNames.w, w); } if ((bitField0_ & 0x00000004) != 0) { output.writeFloat(FieldNames.z, z); } if ((bitField0_ & 0x00000008) != 0) { - output.writeFloat(FieldNames.w, w); + output.writeFloat(FieldNames.y, y); } output.endObject(); } @@ -909,10 +909,10 @@ public final class RotateMapCsReqOuterClass { } break; } - case 121: { - if (input.isAtField(FieldNames.y)) { + case 119: { + if (input.isAtField(FieldNames.w)) { if (!input.trySkipNullValue()) { - y = input.readFloat(); + w = input.readFloat(); bitField0_ |= 0x00000002; } } else { @@ -931,10 +931,10 @@ public final class RotateMapCsReqOuterClass { } break; } - case 119: { - if (input.isAtField(FieldNames.w)) { + case 121: { + if (input.isAtField(FieldNames.y)) { if (!input.trySkipNullValue()) { - w = input.readFloat(); + y = input.readFloat(); bitField0_ |= 0x00000008; } } else { @@ -996,11 +996,11 @@ public final class RotateMapCsReqOuterClass { static class FieldNames { static final FieldName x = FieldName.forField("x"); - static final FieldName y = FieldName.forField("y"); + static final FieldName w = FieldName.forField("w"); static final FieldName z = FieldName.forField("z"); - static final FieldName w = FieldName.forField("w"); + static final FieldName y = FieldName.forField("y"); } } @@ -1011,12 +1011,12 @@ public final class RotateMapCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RotateMapCsReq.Vector4 vector4 = 10; + * optional .RotateMapCsReq.Vector4 vector4 = 3; */ private final Vector4 vector4 = Vector4.newInstance(); /** - * optional .Vector vector3 = 15; + * optional .Vector vector3 = 6; */ private final VectorOuterClass.Vector vector3 = VectorOuterClass.Vector.newInstance(); @@ -1031,7 +1031,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.Vector4 vector4 = 10; + * optional .RotateMapCsReq.Vector4 vector4 = 3; * @return whether the vector4 field is set */ public boolean hasVector4() { @@ -1039,7 +1039,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.Vector4 vector4 = 10; + * optional .RotateMapCsReq.Vector4 vector4 = 3; * @return this */ public NewMapRot clearVector4() { @@ -1049,7 +1049,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.Vector4 vector4 = 10; + * optional .RotateMapCsReq.Vector4 vector4 = 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. @@ -1063,7 +1063,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.Vector4 vector4 = 10; + * optional .RotateMapCsReq.Vector4 vector4 = 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 @@ -1077,7 +1077,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.Vector4 vector4 = 10; + * optional .RotateMapCsReq.Vector4 vector4 = 3; * @param value the vector4 to set * @return this */ @@ -1088,7 +1088,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .Vector vector3 = 15; + * optional .Vector vector3 = 6; * @return whether the vector3 field is set */ public boolean hasVector3() { @@ -1096,7 +1096,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .Vector vector3 = 15; + * optional .Vector vector3 = 6; * @return this */ public NewMapRot clearVector3() { @@ -1106,7 +1106,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .Vector vector3 = 15; + * optional .Vector vector3 = 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. @@ -1120,7 +1120,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .Vector vector3 = 15; + * optional .Vector vector3 = 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 @@ -1134,7 +1134,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .Vector vector3 = 15; + * optional .Vector vector3 = 6; * @param value the vector3 to set * @return this */ @@ -1211,11 +1211,11 @@ public final class RotateMapCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 26); output.writeMessageNoTag(vector4); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 50); output.writeMessageNoTag(vector3); } } @@ -1239,16 +1239,16 @@ public final class RotateMapCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 26: { // vector4 input.readMessage(vector4); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 50) { break; } } - case 122: { + case 50: { // vector3 input.readMessage(vector3); bitField0_ |= 0x00000002; @@ -1383,13 +1383,13 @@ public final class RotateMapCsReqOuterClass { * 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 rogueMap = FieldName.forField("rogueMap", "rogue_map"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); static final FieldName motion = FieldName.forField("motion"); + + static final FieldName rogueMap = FieldName.forField("rogueMap", "rogue_map"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java index 6b10364..531120b 100644 --- a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java @@ -24,12 +24,12 @@ public final class RotateMapScRspOuterClass { private int clientPosVersion; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 4; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -81,7 +81,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; * @return this */ public RotateMapScRsp clearRetcode() { @@ -99,7 +99,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 4; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 4; * @return this */ public RotateMapScRsp clearMotion() { @@ -136,7 +136,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 11; + * 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 RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 11; + * 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 RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 11; + * optional .MotionInfo motion = 4; * @param value the motion to set * @return this */ @@ -250,11 +250,11 @@ public final class RotateMapScRspOuterClass { output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 34); output.writeMessageNoTag(motion); } } @@ -286,20 +286,20 @@ public final class RotateMapScRspOuterClass { clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 88) { break; } } - case 80: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 34) { break; } } - case 90: { + case 34: { // 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 243b13e..c42d960 100644 --- a/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java @@ -20,20 +20,20 @@ public final class RotaterDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional float APDIFCCFAGG = 1; + * optional float APDIFCCFAGG = 14; */ private float aPDIFCCFAGG; /** - * optional uint32 group_id = 9; - */ - private int groupId; - - /** - * optional uint32 unk_int = 13; + * optional uint32 unk_int = 3; */ private int unkInt; + /** + * optional uint32 group_id = 15; + */ + private int groupId; + private RotaterData() { } @@ -45,7 +45,7 @@ public final class RotaterDataOuterClass { } /** - * optional float APDIFCCFAGG = 1; + * optional float APDIFCCFAGG = 14; * @return whether the aPDIFCCFAGG field is set */ public boolean hasAPDIFCCFAGG() { @@ -53,7 +53,7 @@ public final class RotaterDataOuterClass { } /** - * optional float APDIFCCFAGG = 1; + * optional float APDIFCCFAGG = 14; * @return this */ public RotaterData clearAPDIFCCFAGG() { @@ -63,7 +63,7 @@ public final class RotaterDataOuterClass { } /** - * optional float APDIFCCFAGG = 1; + * optional float APDIFCCFAGG = 14; * @return the aPDIFCCFAGG */ public float getAPDIFCCFAGG() { @@ -71,7 +71,7 @@ public final class RotaterDataOuterClass { } /** - * optional float APDIFCCFAGG = 1; + * optional float APDIFCCFAGG = 14; * @param value the aPDIFCCFAGG to set * @return this */ @@ -82,62 +82,25 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 group_id = 9; - * @return whether the groupId field is set + * optional uint32 unk_int = 3; + * @return whether the unkInt field is set */ - public boolean hasGroupId() { + public boolean hasUnkInt() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 group_id = 9; - * @return this - */ - public RotaterData clearGroupId() { - bitField0_ &= ~0x00000002; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 9; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 9; - * @param value the groupId to set - * @return this - */ - public RotaterData setGroupId(final int value) { - bitField0_ |= 0x00000002; - groupId = value; - return this; - } - - /** - * optional uint32 unk_int = 13; - * @return whether the unkInt field is set - */ - public boolean hasUnkInt() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 unk_int = 13; + * optional uint32 unk_int = 3; * @return this */ public RotaterData clearUnkInt() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; unkInt = 0; return this; } /** - * optional uint32 unk_int = 13; + * optional uint32 unk_int = 3; * @return the unkInt */ public int getUnkInt() { @@ -145,24 +108,61 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 unk_int = 13; + * optional uint32 unk_int = 3; * @param value the unkInt to set * @return this */ public RotaterData setUnkInt(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; unkInt = value; return this; } + /** + * optional uint32 group_id = 15; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 group_id = 15; + * @return this + */ + public RotaterData clearGroupId() { + bitField0_ &= ~0x00000004; + 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 RotaterData setGroupId(final int value) { + bitField0_ |= 0x00000004; + groupId = value; + return this; + } + @Override public RotaterData copyFrom(final RotaterData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; aPDIFCCFAGG = other.aPDIFCCFAGG; - groupId = other.groupId; unkInt = other.unkInt; + groupId = other.groupId; } return this; } @@ -176,12 +176,12 @@ public final class RotaterDataOuterClass { if (other.hasAPDIFCCFAGG()) { setAPDIFCCFAGG(other.aPDIFCCFAGG); } - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasUnkInt()) { setUnkInt(other.unkInt); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } return this; } @@ -193,8 +193,8 @@ public final class RotaterDataOuterClass { cachedSize = -1; bitField0_ = 0; aPDIFCCFAGG = 0F; - groupId = 0; unkInt = 0; + groupId = 0; return this; } @@ -219,23 +219,23 @@ public final class RotaterDataOuterClass { RotaterData other = (RotaterData) o; return bitField0_ == other.bitField0_ && (!hasAPDIFCCFAGG() || ProtoUtil.isEqual(aPDIFCCFAGG, other.aPDIFCCFAGG)) - && (!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) 13); + output.writeRawByte((byte) 117); output.writeFloatNoTag(aPDIFCCFAGG); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(unkInt); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(unkInt); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(groupId); } } @@ -246,10 +246,10 @@ public final class RotaterDataOuterClass { size += 5; } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } return size; } @@ -261,27 +261,27 @@ public final class RotaterDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 13: { + case 117: { // aPDIFCCFAGG aPDIFCCFAGG = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 24) { break; } } - case 72: { - // groupId - groupId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 24: { // unkInt unkInt = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -309,10 +309,10 @@ public final class RotaterDataOuterClass { output.writeFloat(FieldNames.aPDIFCCFAGG, aPDIFCCFAGG); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.unkInt, unkInt); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.unkInt, unkInt); + output.writeUInt32(FieldNames.groupId, groupId); } output.endObject(); } @@ -335,11 +335,11 @@ public final class RotaterDataOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -347,11 +347,11 @@ public final class RotaterDataOuterClass { } 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_ |= 0x00000004; } } else { @@ -413,9 +413,9 @@ public final class RotaterDataOuterClass { static class FieldNames { static final FieldName aPDIFCCFAGG = FieldName.forField("APDIFCCFAGG"); - 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/RotatorEnergyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java index fbc6030..846e3a7 100644 --- a/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java @@ -19,15 +19,15 @@ public final class RotatorEnergyInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 max_num = 6; - */ - private int maxNum; - - /** - * optional uint32 cur_num = 7; + * optional uint32 cur_num = 4; */ private int curNum; + /** + * optional uint32 max_num = 14; + */ + private int maxNum; + private RotatorEnergyInfo() { } @@ -39,62 +39,25 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 6; - * @return whether the maxNum field is set + * optional uint32 cur_num = 4; + * @return whether the curNum field is set */ - public boolean hasMaxNum() { + public boolean hasCurNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 max_num = 6; - * @return this - */ - public RotatorEnergyInfo clearMaxNum() { - bitField0_ &= ~0x00000001; - maxNum = 0; - return this; - } - - /** - * optional uint32 max_num = 6; - * @return the maxNum - */ - public int getMaxNum() { - return maxNum; - } - - /** - * optional uint32 max_num = 6; - * @param value the maxNum to set - * @return this - */ - public RotatorEnergyInfo setMaxNum(final int value) { - bitField0_ |= 0x00000001; - maxNum = value; - return this; - } - - /** - * optional uint32 cur_num = 7; - * @return whether the curNum field is set - */ - public boolean hasCurNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_num = 7; + * optional uint32 cur_num = 4; * @return this */ public RotatorEnergyInfo clearCurNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curNum = 0; return this; } /** - * optional uint32 cur_num = 7; + * optional uint32 cur_num = 4; * @return the curNum */ public int getCurNum() { @@ -102,23 +65,60 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 cur_num = 7; + * optional uint32 cur_num = 4; * @param value the curNum to set * @return this */ public RotatorEnergyInfo setCurNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; curNum = value; return this; } + /** + * optional uint32 max_num = 14; + * @return whether the maxNum field is set + */ + public boolean hasMaxNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 max_num = 14; + * @return this + */ + public RotatorEnergyInfo clearMaxNum() { + bitField0_ &= ~0x00000002; + maxNum = 0; + return this; + } + + /** + * optional uint32 max_num = 14; + * @return the maxNum + */ + public int getMaxNum() { + return maxNum; + } + + /** + * optional uint32 max_num = 14; + * @param value the maxNum to set + * @return this + */ + public RotatorEnergyInfo setMaxNum(final int value) { + bitField0_ |= 0x00000002; + maxNum = value; + return this; + } + @Override public RotatorEnergyInfo copyFrom(final RotatorEnergyInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - maxNum = other.maxNum; curNum = other.curNum; + maxNum = other.maxNum; } return this; } @@ -129,12 +129,12 @@ public final class RotatorEnergyInfoOuterClass { return this; } cachedSize = -1; - if (other.hasMaxNum()) { - setMaxNum(other.maxNum); - } if (other.hasCurNum()) { setCurNum(other.curNum); } + if (other.hasMaxNum()) { + setMaxNum(other.maxNum); + } return this; } @@ -145,8 +145,8 @@ public final class RotatorEnergyInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - maxNum = 0; curNum = 0; + maxNum = 0; return this; } @@ -170,19 +170,19 @@ public final class RotatorEnergyInfoOuterClass { } RotatorEnergyInfo other = (RotatorEnergyInfo) o; return bitField0_ == other.bitField0_ - && (!hasMaxNum() || maxNum == other.maxNum) - && (!hasCurNum() || curNum == other.curNum); + && (!hasCurNum() || curNum == other.curNum) + && (!hasMaxNum() || maxNum == other.maxNum); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(maxNum); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(curNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(curNum); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(maxNum); } } @@ -190,10 +190,10 @@ public final class RotatorEnergyInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curNum); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxNum); } return size; } @@ -205,18 +205,18 @@ public final class RotatorEnergyInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // maxNum - maxNum = input.readUInt32(); + case 32: { + // curNum + curNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 112) { break; } } - case 56: { - // curNum - curNum = input.readUInt32(); + case 112: { + // maxNum + maxNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RotatorEnergyInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.maxNum, maxNum); + output.writeUInt32(FieldNames.curNum, curNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curNum, curNum); + output.writeUInt32(FieldNames.maxNum, maxNum); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RotatorEnergyInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1081154686: - case 844443179: { - if (input.isAtField(FieldNames.maxNum)) { + case -1349154522: + case 1126382855: { + if (input.isAtField(FieldNames.curNum)) { if (!input.trySkipNullValue()) { - maxNum = input.readUInt32(); + curNum = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class RotatorEnergyInfoOuterClass { } break; } - case -1349154522: - case 1126382855: { - if (input.isAtField(FieldNames.curNum)) { + case -1081154686: + case 844443179: { + if (input.isAtField(FieldNames.maxNum)) { if (!input.trySkipNullValue()) { - curNum = input.readUInt32(); + maxNum = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class RotatorEnergyInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName maxNum = FieldName.forField("maxNum", "max_num"); - static final FieldName curNum = FieldName.forField("curNum", "cur_num"); + + static final FieldName maxNum = FieldName.forField("maxNum", "max_num"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java index aed2a86..c2e08d5 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 uid = 7; + * optional uint32 uid = 2; */ private int uid; - /** - * optional uint32 map_layer = 9; - */ - private int mapLayer; - /** * optional uint32 base_avatar_id = 11; */ private int baseAvatarId; /** - * optional .AvatarType avatar_type = 2; + * optional uint32 map_layer = 15; + */ + private int mapLayer; + + /** + * optional .AvatarType avatar_type = 6; */ private int avatarType; @@ -49,7 +49,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 2; * @return whether the uid field is set */ public boolean hasUid() { @@ -57,7 +57,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 2; * @return this */ public SceneActorInfo clearUid() { @@ -67,7 +67,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 2; * @return the uid */ public int getUid() { @@ -75,7 +75,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 2; * @param value the uid to set * @return this */ @@ -85,49 +85,12 @@ public final class SceneActorInfoOuterClass { return this; } - /** - * optional uint32 map_layer = 9; - * @return whether the mapLayer field is set - */ - public boolean hasMapLayer() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 map_layer = 9; - * @return this - */ - public SceneActorInfo clearMapLayer() { - bitField0_ &= ~0x00000002; - mapLayer = 0; - return this; - } - - /** - * optional uint32 map_layer = 9; - * @return the mapLayer - */ - public int getMapLayer() { - return mapLayer; - } - - /** - * optional uint32 map_layer = 9; - * @param value the mapLayer to set - * @return this - */ - public SceneActorInfo setMapLayer(final int value) { - bitField0_ |= 0x00000002; - mapLayer = value; - return this; - } - /** * optional uint32 base_avatar_id = 11; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -135,7 +98,7 @@ public final class SceneActorInfoOuterClass { * @return this */ public SceneActorInfo clearBaseAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; baseAvatarId = 0; return this; } @@ -154,13 +117,50 @@ public final class SceneActorInfoOuterClass { * @return this */ public SceneActorInfo setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; baseAvatarId = value; return this; } /** - * optional .AvatarType avatar_type = 2; + * optional uint32 map_layer = 15; + * @return whether the mapLayer field is set + */ + public boolean hasMapLayer() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 map_layer = 15; + * @return this + */ + public SceneActorInfo clearMapLayer() { + bitField0_ &= ~0x00000004; + mapLayer = 0; + return this; + } + + /** + * optional uint32 map_layer = 15; + * @return the mapLayer + */ + public int getMapLayer() { + return mapLayer; + } + + /** + * optional uint32 map_layer = 15; + * @param value the mapLayer to set + * @return this + */ + public SceneActorInfo setMapLayer(final int value) { + bitField0_ |= 0x00000004; + mapLayer = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 6; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -168,7 +168,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 6; * @return this */ public SceneActorInfo clearAvatarType() { @@ -178,7 +178,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 6; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -211,7 +211,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 6; * @param value the avatarType to set * @return this */ @@ -227,8 +227,8 @@ public final class SceneActorInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; uid = other.uid; - mapLayer = other.mapLayer; baseAvatarId = other.baseAvatarId; + mapLayer = other.mapLayer; avatarType = other.avatarType; } return this; @@ -243,12 +243,12 @@ public final class SceneActorInfoOuterClass { if (other.hasUid()) { setUid(other.uid); } - if (other.hasMapLayer()) { - setMapLayer(other.mapLayer); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasMapLayer()) { + setMapLayer(other.mapLayer); + } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } @@ -263,8 +263,8 @@ public final class SceneActorInfoOuterClass { cachedSize = -1; bitField0_ = 0; uid = 0; - mapLayer = 0; baseAvatarId = 0; + mapLayer = 0; avatarType = 0; return this; } @@ -290,27 +290,27 @@ public final class SceneActorInfoOuterClass { SceneActorInfo other = (SceneActorInfo) o; return bitField0_ == other.bitField0_ && (!hasUid() || uid == other.uid) - && (!hasMapLayer() || mapLayer == other.mapLayer) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasMapLayer() || mapLayer == other.mapLayer) && (!hasAvatarType() || avatarType == other.avatarType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(mapLayer); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 88); output.writeUInt32NoTag(baseAvatarId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(mapLayer); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 48); output.writeEnumNoTag(avatarType); } } @@ -322,10 +322,10 @@ public final class SceneActorInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -340,20 +340,11 @@ public final class SceneActorInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // mapLayer - mapLayer = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 88) { break; } @@ -361,13 +352,22 @@ public final class SceneActorInfoOuterClass { case 88: { // baseAvatarId baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16) { + if (tag != 120) { break; } } - case 16: { + case 120: { + // mapLayer + mapLayer = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -400,10 +400,10 @@ public final class SceneActorInfoOuterClass { output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mapLayer, mapLayer); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.mapLayer, mapLayer); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -429,11 +429,11 @@ public final class SceneActorInfoOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -441,11 +441,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_ |= 0x00000004; } } else { @@ -525,10 +525,10 @@ public final class SceneActorInfoOuterClass { static class FieldNames { static final FieldName uid = FieldName.forField("uid"); - 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 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 8303d91..7e8b343 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java @@ -20,55 +20,55 @@ public final class SceneBattleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rounds_limit = 2; - */ - private int roundsLimit; - - /** - * optional uint32 stage_id = 4; + * optional uint32 stage_id = 1; */ private int stageId; /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 2; */ private int worldLevel; /** - * optional uint32 logic_random_seed = 12; + * optional uint32 rounds_limit = 4; + */ + private int roundsLimit; + + /** + * optional uint32 logic_random_seed = 6; */ private int logicRandomSeed; /** - * optional uint32 battle_id = 14; + * optional uint32 battle_id = 12; */ private int battleId; /** - * repeated .SceneMonsterWave monster_wave_list = 1; - */ - private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); - - /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 5; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BattleBuffOuterClass.BattleBuff.getFactory()); /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 7; */ private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * repeated .SceneMonsterWave monster_wave_list = 14; */ - private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); + private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + * repeated .BattleEventBattleInfo event_battle_info_list = 321; */ private final RepeatedMessage eventBattleInfoList = RepeatedMessage.newEmptyInstance(BattleEventBattleInfoOuterClass.BattleEventBattleInfo.getFactory()); + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 892; + */ + private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); + private SceneBattleInfo() { } @@ -80,62 +80,25 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 rounds_limit = 2; - * @return whether the roundsLimit field is set + * optional uint32 stage_id = 1; + * @return whether the stageId field is set */ - public boolean hasRoundsLimit() { + public boolean hasStageId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rounds_limit = 2; - * @return this - */ - public SceneBattleInfo clearRoundsLimit() { - bitField0_ &= ~0x00000001; - roundsLimit = 0; - return this; - } - - /** - * optional uint32 rounds_limit = 2; - * @return the roundsLimit - */ - public int getRoundsLimit() { - return roundsLimit; - } - - /** - * optional uint32 rounds_limit = 2; - * @param value the roundsLimit to set - * @return this - */ - public SceneBattleInfo setRoundsLimit(final int value) { - bitField0_ |= 0x00000001; - roundsLimit = value; - return this; - } - - /** - * optional uint32 stage_id = 4; - * @return whether the stageId field is set - */ - public boolean hasStageId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 stage_id = 4; + * optional uint32 stage_id = 1; * @return this */ public SceneBattleInfo clearStageId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; stageId = 0; return this; } /** - * optional uint32 stage_id = 4; + * optional uint32 stage_id = 1; * @return the stageId */ public int getStageId() { @@ -143,36 +106,36 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 stage_id = 4; + * optional uint32 stage_id = 1; * @param value the stageId to set * @return this */ public SceneBattleInfo setStageId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; stageId = value; return this; } /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 2; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 2; * @return this */ public SceneBattleInfo clearWorldLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; worldLevel = 0; return this; } /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 2; * @return the worldLevel */ public int getWorldLevel() { @@ -180,18 +143,55 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 2; * @param value the worldLevel to set * @return this */ public SceneBattleInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; worldLevel = value; return this; } /** - * optional uint32 logic_random_seed = 12; + * optional uint32 rounds_limit = 4; + * @return whether the roundsLimit field is set + */ + public boolean hasRoundsLimit() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 rounds_limit = 4; + * @return this + */ + public SceneBattleInfo clearRoundsLimit() { + bitField0_ &= ~0x00000004; + roundsLimit = 0; + return this; + } + + /** + * optional uint32 rounds_limit = 4; + * @return the roundsLimit + */ + public int getRoundsLimit() { + return roundsLimit; + } + + /** + * optional uint32 rounds_limit = 4; + * @param value the roundsLimit to set + * @return this + */ + public SceneBattleInfo setRoundsLimit(final int value) { + bitField0_ |= 0x00000004; + roundsLimit = value; + return this; + } + + /** + * optional uint32 logic_random_seed = 6; * @return whether the logicRandomSeed field is set */ public boolean hasLogicRandomSeed() { @@ -199,7 +199,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 logic_random_seed = 12; + * optional uint32 logic_random_seed = 6; * @return this */ public SceneBattleInfo clearLogicRandomSeed() { @@ -209,7 +209,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 logic_random_seed = 12; + * optional uint32 logic_random_seed = 6; * @return the logicRandomSeed */ public int getLogicRandomSeed() { @@ -217,7 +217,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 logic_random_seed = 12; + * optional uint32 logic_random_seed = 6; * @param value the logicRandomSeed to set * @return this */ @@ -228,7 +228,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 battle_id = 14; + * optional uint32 battle_id = 12; * @return whether the battleId field is set */ public boolean hasBattleId() { @@ -236,7 +236,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 battle_id = 14; + * optional uint32 battle_id = 12; * @return this */ public SceneBattleInfo clearBattleId() { @@ -246,7 +246,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 battle_id = 14; + * optional uint32 battle_id = 12; * @return the battleId */ public int getBattleId() { @@ -254,7 +254,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 battle_id = 14; + * optional uint32 battle_id = 12; * @param value the battleId to set * @return this */ @@ -265,96 +265,25 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneMonsterWave monster_wave_list = 1; - * @return whether the monsterWaveList field is set + * repeated .BattleBuff buff_list = 5; + * @return whether the buffList field is set */ - public boolean hasMonsterWaveList() { + public boolean hasBuffList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .SceneMonsterWave monster_wave_list = 1; - * @return this - */ - public SceneBattleInfo clearMonsterWaveList() { - bitField0_ &= ~0x00000020; - monsterWaveList.clear(); - return this; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 1; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * 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 = 1; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableMonsterWaveList( - ) { - bitField0_ |= 0x00000020; - return monsterWaveList; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 1; - * @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 = 1; - * @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 = 3; - * @return whether the buffList field is set - */ - public boolean hasBuffList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 5; * @return this */ public SceneBattleInfo clearBuffList() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; buffList.clear(); return this; } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff 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. @@ -368,7 +297,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff 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 @@ -377,52 +306,52 @@ public final class SceneBattleInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableBuffList() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return buffList; } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 5; * @param value the buffList to add * @return this */ public SceneBattleInfo addBuffList(final BattleBuffOuterClass.BattleBuff value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; buffList.add(value); return this; } /** - * repeated .BattleBuff buff_list = 3; + * repeated .BattleBuff buff_list = 5; * @param values the buffList to add * @return this */ public SceneBattleInfo addAllBuffList(final BattleBuffOuterClass.BattleBuff... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; buffList.addAll(values); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 7; * @return whether the battleAvatarList field is set */ public boolean hasBattleAvatarList() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000040) != 0; } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 7; * @return this */ public SceneBattleInfo clearBattleAvatarList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; battleAvatarList.clear(); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_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. @@ -436,7 +365,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_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 @@ -445,67 +374,67 @@ public final class SceneBattleInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableBattleAvatarList() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return battleAvatarList; } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 7; * @param value the battleAvatarList to add * @return this */ public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; battleAvatarList.add(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 7; * @param values the battleAvatarList to add * @return this */ public SceneBattleInfo addAllBattleAvatarList( final BattleAvatarOuterClass.BattleAvatar... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; battleAvatarList.addAll(values); return this; } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; - * @return whether the battleTargetInfo field is set + * repeated .SceneMonsterWave monster_wave_list = 14; + * @return whether the monsterWaveList field is set */ - public boolean hasBattleTargetInfo() { - return (bitField0_ & 0x00000100) != 0; + public boolean hasMonsterWaveList() { + return (bitField0_ & 0x00000080) != 0; } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * repeated .SceneMonsterWave monster_wave_list = 14; * @return this */ - public SceneBattleInfo clearBattleTargetInfo() { - bitField0_ &= ~0x00000100; - battleTargetInfo.clear(); + public SceneBattleInfo clearMonsterWaveList() { + bitField0_ &= ~0x00000080; + monsterWaveList.clear(); return this; } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * repeated .SceneMonsterWave monster_wave_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 #getMutableBattleTargetInfo()} if you want to modify it. + * Use {@link #getMutableMonsterWaveList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getBattleTargetInfo() { - return battleTargetInfo; + public RepeatedMessage getMonsterWaveList() { + return monsterWaveList; } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * repeated .SceneMonsterWave monster_wave_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 @@ -513,53 +442,56 @@ public final class SceneBattleInfoOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableBattleTargetInfo() { - bitField0_ |= 0x00000100; - return battleTargetInfo; + public RepeatedMessage getMutableMonsterWaveList( + ) { + bitField0_ |= 0x00000080; + return monsterWaveList; } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; - * @param value the battleTargetInfo to add + * repeated .SceneMonsterWave monster_wave_list = 14; + * @param value the monsterWaveList to add * @return this */ - public SceneBattleInfo addBattleTargetInfo(final BattleTargetInfoEntry value) { - bitField0_ |= 0x00000100; - battleTargetInfo.add(value); + public SceneBattleInfo addMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave value) { + bitField0_ |= 0x00000080; + monsterWaveList.add(value); return this; } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; - * @param values the battleTargetInfo to add + * repeated .SceneMonsterWave monster_wave_list = 14; + * @param values the monsterWaveList to add * @return this */ - public SceneBattleInfo addAllBattleTargetInfo(final BattleTargetInfoEntry... values) { - bitField0_ |= 0x00000100; - battleTargetInfo.addAll(values); + public SceneBattleInfo addAllMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { + bitField0_ |= 0x00000080; + monsterWaveList.addAll(values); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + * repeated .BattleEventBattleInfo event_battle_info_list = 321; * @return whether the eventBattleInfoList field is set */ public boolean hasEventBattleInfoList() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + * repeated .BattleEventBattleInfo event_battle_info_list = 321; * @return this */ public SceneBattleInfo clearEventBattleInfoList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000100; eventBattleInfoList.clear(); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + * repeated .BattleEventBattleInfo event_battle_info_list = 321; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -574,7 +506,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + * repeated .BattleEventBattleInfo event_battle_info_list = 321; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -584,49 +516,117 @@ public final class SceneBattleInfoOuterClass { */ public RepeatedMessage getMutableEventBattleInfoList( ) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return eventBattleInfoList; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + * repeated .BattleEventBattleInfo event_battle_info_list = 321; * @param value the eventBattleInfoList to add * @return this */ public SceneBattleInfo addEventBattleInfoList( final BattleEventBattleInfoOuterClass.BattleEventBattleInfo value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; eventBattleInfoList.add(value); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + * repeated .BattleEventBattleInfo event_battle_info_list = 321; * @param values the eventBattleInfoList to add * @return this */ public SceneBattleInfo addAllEventBattleInfoList( final BattleEventBattleInfoOuterClass.BattleEventBattleInfo... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; eventBattleInfoList.addAll(values); return this; } + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 892; + * @return whether the battleTargetInfo field is set + */ + public boolean hasBattleTargetInfo() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 892; + * @return this + */ + public SceneBattleInfo clearBattleTargetInfo() { + bitField0_ &= ~0x00000200; + battleTargetInfo.clear(); + return this; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 892; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableBattleTargetInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBattleTargetInfo() { + return battleTargetInfo; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 892; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableBattleTargetInfo() { + bitField0_ |= 0x00000200; + return battleTargetInfo; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 892; + * @param value the battleTargetInfo to add + * @return this + */ + public SceneBattleInfo addBattleTargetInfo(final BattleTargetInfoEntry value) { + bitField0_ |= 0x00000200; + battleTargetInfo.add(value); + return this; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 892; + * @param values the battleTargetInfo to add + * @return this + */ + public SceneBattleInfo addAllBattleTargetInfo(final BattleTargetInfoEntry... values) { + bitField0_ |= 0x00000200; + battleTargetInfo.addAll(values); + return this; + } + @Override public SceneBattleInfo copyFrom(final SceneBattleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - roundsLimit = other.roundsLimit; stageId = other.stageId; worldLevel = other.worldLevel; + roundsLimit = other.roundsLimit; logicRandomSeed = other.logicRandomSeed; battleId = other.battleId; - monsterWaveList.copyFrom(other.monsterWaveList); buffList.copyFrom(other.buffList); battleAvatarList.copyFrom(other.battleAvatarList); - battleTargetInfo.copyFrom(other.battleTargetInfo); + monsterWaveList.copyFrom(other.monsterWaveList); eventBattleInfoList.copyFrom(other.eventBattleInfoList); + battleTargetInfo.copyFrom(other.battleTargetInfo); } return this; } @@ -637,36 +637,36 @@ public final class SceneBattleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRoundsLimit()) { - setRoundsLimit(other.roundsLimit); - } if (other.hasStageId()) { setStageId(other.stageId); } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } + if (other.hasRoundsLimit()) { + setRoundsLimit(other.roundsLimit); + } if (other.hasLogicRandomSeed()) { setLogicRandomSeed(other.logicRandomSeed); } if (other.hasBattleId()) { setBattleId(other.battleId); } - if (other.hasMonsterWaveList()) { - getMutableMonsterWaveList().addAll(other.monsterWaveList); - } if (other.hasBuffList()) { getMutableBuffList().addAll(other.buffList); } if (other.hasBattleAvatarList()) { getMutableBattleAvatarList().addAll(other.battleAvatarList); } - if (other.hasBattleTargetInfo()) { - getMutableBattleTargetInfo().addAll(other.battleTargetInfo); + if (other.hasMonsterWaveList()) { + getMutableMonsterWaveList().addAll(other.monsterWaveList); } if (other.hasEventBattleInfoList()) { getMutableEventBattleInfoList().addAll(other.eventBattleInfoList); } + if (other.hasBattleTargetInfo()) { + getMutableBattleTargetInfo().addAll(other.battleTargetInfo); + } return this; } @@ -677,16 +677,16 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - roundsLimit = 0; stageId = 0; worldLevel = 0; + roundsLimit = 0; logicRandomSeed = 0; battleId = 0; - monsterWaveList.clear(); buffList.clear(); battleAvatarList.clear(); - battleTargetInfo.clear(); + monsterWaveList.clear(); eventBattleInfoList.clear(); + battleTargetInfo.clear(); return this; } @@ -697,11 +697,11 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - monsterWaveList.clearQuick(); buffList.clearQuick(); battleAvatarList.clearQuick(); - battleTargetInfo.clearQuick(); + monsterWaveList.clearQuick(); eventBattleInfoList.clearQuick(); + battleTargetInfo.clearQuick(); return this; } @@ -715,68 +715,68 @@ public final class SceneBattleInfoOuterClass { } SceneBattleInfo other = (SceneBattleInfo) o; return bitField0_ == other.bitField0_ - && (!hasRoundsLimit() || roundsLimit == other.roundsLimit) && (!hasStageId() || stageId == other.stageId) && (!hasWorldLevel() || worldLevel == other.worldLevel) + && (!hasRoundsLimit() || roundsLimit == other.roundsLimit) && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed) && (!hasBattleId() || battleId == other.battleId) - && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)) && (!hasBuffList() || buffList.equals(other.buffList)) && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)) - && (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo)) - && (!hasEventBattleInfoList() || eventBattleInfoList.equals(other.eventBattleInfoList)); + && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)) + && (!hasEventBattleInfoList() || eventBattleInfoList.equals(other.eventBattleInfoList)) + && (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(roundsLimit); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(stageId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); output.writeUInt32NoTag(worldLevel); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(roundsLimit); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(logicRandomSeed); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < monsterWaveList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(monsterWaveList.get(i)); - } - } - if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 42); output.writeMessageNoTag(buffList.get(i)); } } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 58); output.writeMessageNoTag(battleAvatarList.get(i)); } } + if ((bitField0_ & 0x00000080) != 0) { + for (int i = 0; i < monsterWaveList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(monsterWaveList.get(i)); + } + } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < battleTargetInfo.length(); i++) { - output.writeRawLittleEndian16((short) 2474); - output.writeMessageNoTag(battleTargetInfo.get(i)); + for (int i = 0; i < eventBattleInfoList.length(); i++) { + output.writeRawLittleEndian16((short) 5258); + output.writeMessageNoTag(eventBattleInfoList.get(i)); } } if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < eventBattleInfoList.length(); i++) { - output.writeRawLittleEndian16((short) 31466); - output.writeMessageNoTag(eventBattleInfoList.get(i)); + for (int i = 0; i < battleTargetInfo.length(); i++) { + output.writeRawLittleEndian16((short) 14306); + output.writeMessageNoTag(battleTargetInfo.get(i)); } } } @@ -785,14 +785,14 @@ public final class SceneBattleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); } @@ -800,19 +800,19 @@ public final class SceneBattleInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); - } - if ((bitField0_ & 0x00000040) != 0) { size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000040) != 0) { size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); } + if ((bitField0_ & 0x00000080) != 0) { + size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); + } if ((bitField0_ & 0x00000100) != 0) { - size += (2 * battleTargetInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleTargetInfo); + size += (2 * eventBattleInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eventBattleInfoList); } if ((bitField0_ & 0x00000200) != 0) { - size += (2 * eventBattleInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eventBattleInfoList); + size += (2 * battleTargetInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleTargetInfo); } return size; } @@ -824,86 +824,86 @@ public final class SceneBattleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // roundsLimit - roundsLimit = input.readUInt32(); + case 8: { + // stageId + stageId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // worldLevel + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 32) { break; } } case 32: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000002; + // roundsLimit + roundsLimit = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 48) { break; } } case 48: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000004; + // logicRandomSeed + logicRandomSeed = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // logicRandomSeed - logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // battleId battleId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { - // monsterWaveList - tag = input.readRepeatedMessage(monsterWaveList, tag); - bitField0_ |= 0x00000020; - if (tag != 26) { - break; - } - } - case 26: { + case 42: { // buffList tag = input.readRepeatedMessage(buffList, tag); - bitField0_ |= 0x00000040; - if (tag != 122) { + bitField0_ |= 0x00000020; + if (tag != 58) { break; } } - case 122: { + case 58: { // battleAvatarList tag = input.readRepeatedMessage(battleAvatarList, tag); + bitField0_ |= 0x00000040; + if (tag != 114) { + break; + } + } + case 114: { + // monsterWaveList + tag = input.readRepeatedMessage(monsterWaveList, tag); bitField0_ |= 0x00000080; - if (tag != 1194) { + if (tag != 2570) { break; } } - case 1194: { - // battleTargetInfo - tag = input.readRepeatedMessage(battleTargetInfo, tag); - bitField0_ |= 0x00000100; - if (tag != 15722) { - break; - } - } - case 15722: { + case 2570: { // eventBattleInfoList tag = input.readRepeatedMessage(eventBattleInfoList, tag); + bitField0_ |= 0x00000100; + if (tag != 7138) { + break; + } + } + case 7138: { + // battleTargetInfo + tag = input.readRepeatedMessage(battleTargetInfo, tag); bitField0_ |= 0x00000200; if (tag != 0) { break; @@ -927,14 +927,14 @@ public final class SceneBattleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.roundsLimit, roundsLimit); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.roundsLimit, roundsLimit); + } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); } @@ -942,19 +942,19 @@ public final class SceneBattleInfoOuterClass { output.writeUInt32(FieldNames.battleId, battleId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.buffList, buffList); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); } + if ((bitField0_ & 0x00000080) != 0) { + output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); + } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.battleTargetInfo, battleTargetInfo); + output.writeRepeatedMessage(FieldNames.eventBattleInfoList, eventBattleInfoList); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedMessage(FieldNames.eventBattleInfoList, eventBattleInfoList); + output.writeRepeatedMessage(FieldNames.battleTargetInfo, battleTargetInfo); } output.endObject(); } @@ -966,24 +966,12 @@ public final class SceneBattleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 306477590: - case 1457479585: { - if (input.isAtField(FieldNames.roundsLimit)) { - if (!input.trySkipNullValue()) { - roundsLimit = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1897528135: case 1306191356: { if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { stageId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -995,6 +983,18 @@ public final class SceneBattleInfoOuterClass { if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { worldLevel = 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 { @@ -1026,24 +1026,12 @@ public final class SceneBattleInfoOuterClass { } break; } - case 697746737: - case -1492024321: { - if (input.isAtField(FieldNames.monsterWaveList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(monsterWaveList); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } case -1522789487: case 55792906: { if (input.isAtField(FieldNames.buffList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(buffList); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -1055,19 +1043,19 @@ public final class SceneBattleInfoOuterClass { if (input.isAtField(FieldNames.battleAvatarList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(battleAvatarList); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); } break; } - case 1657979063: - case 2141477269: { - if (input.isAtField(FieldNames.battleTargetInfo)) { + case 697746737: + case -1492024321: { + if (input.isAtField(FieldNames.monsterWaveList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(battleTargetInfo); - bitField0_ |= 0x00000100; + input.readRepeatedMessage(monsterWaveList); + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1079,6 +1067,18 @@ public final class SceneBattleInfoOuterClass { if (input.isAtField(FieldNames.eventBattleInfoList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(eventBattleInfoList); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1657979063: + case 2141477269: { + if (input.isAtField(FieldNames.battleTargetInfo)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(battleTargetInfo); bitField0_ |= 0x00000200; } } else { @@ -1486,25 +1486,25 @@ public final class SceneBattleInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit"); - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); + static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit"); + static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed"); static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); - static final FieldName buffList = FieldName.forField("buffList", "buff_list"); static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); - static final FieldName battleTargetInfo = FieldName.forField("battleTargetInfo", "battle_target_info"); + static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); static final FieldName eventBattleInfoList = FieldName.forField("eventBattleInfoList", "event_battle_info_list"); + + static final FieldName battleTargetInfo = FieldName.forField("battleTargetInfo", "battle_target_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java index cf685da..76f20c0 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java @@ -19,20 +19,20 @@ public final class SceneCastSkillCostMpCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 caster_id = 2; - */ - private int casterId; - - /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; */ private int attackedGroupId; /** - * optional uint32 skill_index = 15; + * optional uint32 skill_index = 10; */ private int skillIndex; + /** + * optional uint32 caster_id = 11; + */ + private int casterId; + private SceneCastSkillCostMpCsReq() { } @@ -44,62 +44,25 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } /** - * optional uint32 caster_id = 2; - * @return whether the casterId field is set + * optional uint32 attacked_group_id = 5; + * @return whether the attackedGroupId field is set */ - public boolean hasCasterId() { + public boolean hasAttackedGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 caster_id = 2; - * @return this - */ - public SceneCastSkillCostMpCsReq clearCasterId() { - bitField0_ &= ~0x00000001; - casterId = 0; - return this; - } - - /** - * optional uint32 caster_id = 2; - * @return the casterId - */ - public int getCasterId() { - return casterId; - } - - /** - * optional uint32 caster_id = 2; - * @param value the casterId to set - * @return this - */ - public SceneCastSkillCostMpCsReq setCasterId(final int value) { - bitField0_ |= 0x00000001; - casterId = value; - return this; - } - - /** - * optional uint32 attacked_group_id = 10; - * @return whether the attackedGroupId field is set - */ - public boolean hasAttackedGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; * @return this */ public SceneCastSkillCostMpCsReq clearAttackedGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; attackedGroupId = 0; return this; } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -107,36 +70,36 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; * @param value the attackedGroupId to set * @return this */ public SceneCastSkillCostMpCsReq setAttackedGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; attackedGroupId = value; return this; } /** - * optional uint32 skill_index = 15; + * optional uint32 skill_index = 10; * @return whether the skillIndex field is set */ public boolean hasSkillIndex() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 skill_index = 15; + * optional uint32 skill_index = 10; * @return this */ public SceneCastSkillCostMpCsReq clearSkillIndex() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; skillIndex = 0; return this; } /** - * optional uint32 skill_index = 15; + * optional uint32 skill_index = 10; * @return the skillIndex */ public int getSkillIndex() { @@ -144,24 +107,61 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } /** - * optional uint32 skill_index = 15; + * optional uint32 skill_index = 10; * @param value the skillIndex to set * @return this */ public SceneCastSkillCostMpCsReq setSkillIndex(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; skillIndex = value; return this; } + /** + * optional uint32 caster_id = 11; + * @return whether the casterId field is set + */ + public boolean hasCasterId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 caster_id = 11; + * @return this + */ + public SceneCastSkillCostMpCsReq clearCasterId() { + bitField0_ &= ~0x00000004; + casterId = 0; + return this; + } + + /** + * optional uint32 caster_id = 11; + * @return the casterId + */ + public int getCasterId() { + return casterId; + } + + /** + * optional uint32 caster_id = 11; + * @param value the casterId to set + * @return this + */ + public SceneCastSkillCostMpCsReq setCasterId(final int value) { + bitField0_ |= 0x00000004; + casterId = value; + return this; + } + @Override public SceneCastSkillCostMpCsReq copyFrom(final SceneCastSkillCostMpCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - casterId = other.casterId; attackedGroupId = other.attackedGroupId; skillIndex = other.skillIndex; + casterId = other.casterId; } return this; } @@ -172,15 +172,15 @@ public final class SceneCastSkillCostMpCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasCasterId()) { - setCasterId(other.casterId); - } if (other.hasAttackedGroupId()) { setAttackedGroupId(other.attackedGroupId); } if (other.hasSkillIndex()) { setSkillIndex(other.skillIndex); } + if (other.hasCasterId()) { + setCasterId(other.casterId); + } return this; } @@ -191,9 +191,9 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - casterId = 0; attackedGroupId = 0; skillIndex = 0; + casterId = 0; return this; } @@ -217,24 +217,24 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } SceneCastSkillCostMpCsReq other = (SceneCastSkillCostMpCsReq) o; return bitField0_ == other.bitField0_ - && (!hasCasterId() || casterId == other.casterId) && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) - && (!hasSkillIndex() || skillIndex == other.skillIndex); + && (!hasSkillIndex() || skillIndex == other.skillIndex) + && (!hasCasterId() || casterId == other.casterId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(casterId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(attackedGroupId); + output.writeUInt32NoTag(skillIndex); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(skillIndex); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(casterId); } } @@ -242,14 +242,14 @@ public final class SceneCastSkillCostMpCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); + } return size; } @@ -260,9 +260,9 @@ public final class SceneCastSkillCostMpCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // casterId - casterId = input.readUInt32(); + case 40: { + // attackedGroupId + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 80) { @@ -270,17 +270,17 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } } case 80: { - // attackedGroupId - attackedGroupId = input.readUInt32(); + // skillIndex + skillIndex = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { - // skillIndex - skillIndex = input.readUInt32(); + case 88: { + // casterId + casterId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,14 +305,14 @@ public final class SceneCastSkillCostMpCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.casterId, casterId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.skillIndex, skillIndex); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.casterId, casterId); + } output.endObject(); } @@ -323,24 +323,12 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 35676775: - case 1106001422: { - if (input.isAtField(FieldNames.casterId)) { - if (!input.trySkipNullValue()) { - casterId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1725961965: case -715836621: { if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { attackedGroupId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -352,6 +340,18 @@ public final class SceneCastSkillCostMpCsReqOuterClass { if (input.isAtField(FieldNames.skillIndex)) { if (!input.trySkipNullValue()) { skillIndex = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 35676775: + case 1106001422: { + if (input.isAtField(FieldNames.casterId)) { + if (!input.trySkipNullValue()) { + casterId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -412,11 +412,11 @@ public final class SceneCastSkillCostMpCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName casterId = FieldName.forField("casterId", "caster_id"); - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); + + static final FieldName casterId = FieldName.forField("casterId", "caster_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java index 227e19c..023bb20 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SceneCastSkillCostMpScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional uint32 attacked_group_id = 2; + * optional uint32 attacked_group_id = 10; */ private int attackedGroupId; @@ -39,7 +39,7 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return this */ public SceneCastSkillCostMpScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 attacked_group_id = 2; + * optional uint32 attacked_group_id = 10; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -84,7 +84,7 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 attacked_group_id = 2; + * optional uint32 attacked_group_id = 10; * @return this */ public SceneCastSkillCostMpScRsp clearAttackedGroupId() { @@ -94,7 +94,7 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 attacked_group_id = 2; + * optional uint32 attacked_group_id = 10; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -102,7 +102,7 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 attacked_group_id = 2; + * optional uint32 attacked_group_id = 10; * @param value the attackedGroupId to set * @return this */ @@ -177,11 +177,11 @@ public final class SceneCastSkillCostMpScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(attackedGroupId); } } @@ -205,16 +205,16 @@ public final class SceneCastSkillCostMpScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 80) { break; } } - case 16: { + case 80: { // attackedGroupId attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java index d02d8b7..f7ce302 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 attacked_group_id = 10; - */ - private int attackedGroupId; - - /** - * optional uint32 caster_id = 13; - */ - private int casterId; - - /** - * optional uint32 skill_index = 15; + * optional uint32 skill_index = 4; */ private int skillIndex; /** - * optional .MotionInfo target_motion = 12; + * optional uint32 caster_id = 14; + */ + private int casterId; + + /** + * optional uint32 attacked_group_id = 15; + */ + private int attackedGroupId; + + /** + * optional .MotionInfo target_motion = 5; */ private final MotionInfoOuterClass.MotionInfo targetMotion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 10; */ private final RepeatedInt hitTargetEntityIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .AssistMonsterWave assist_monster_wave_list = 4; + * repeated .AssistMonsterWave assist_monster_wave_list = 12; */ private final RepeatedMessage assistMonsterWaveList = RepeatedMessage.newEmptyInstance(AssistMonsterWaveOuterClass.AssistMonsterWave.getFactory()); @@ -61,44 +61,44 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 attacked_group_id = 10; - * @return whether the attackedGroupId field is set + * optional uint32 skill_index = 4; + * @return whether the skillIndex field is set */ - public boolean hasAttackedGroupId() { + public boolean hasSkillIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 skill_index = 4; * @return this */ - public SceneCastSkillCsReq clearAttackedGroupId() { + public SceneCastSkillCsReq clearSkillIndex() { bitField0_ &= ~0x00000001; - attackedGroupId = 0; + skillIndex = 0; return this; } /** - * optional uint32 attacked_group_id = 10; - * @return the attackedGroupId + * optional uint32 skill_index = 4; + * @return the skillIndex */ - public int getAttackedGroupId() { - return attackedGroupId; + public int getSkillIndex() { + return skillIndex; } /** - * optional uint32 attacked_group_id = 10; - * @param value the attackedGroupId to set + * optional uint32 skill_index = 4; + * @param value the skillIndex to set * @return this */ - public SceneCastSkillCsReq setAttackedGroupId(final int value) { + public SceneCastSkillCsReq setSkillIndex(final int value) { bitField0_ |= 0x00000001; - attackedGroupId = value; + skillIndex = value; return this; } /** - * optional uint32 caster_id = 13; + * optional uint32 caster_id = 14; * @return whether the casterId field is set */ public boolean hasCasterId() { @@ -106,7 +106,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 caster_id = 13; + * optional uint32 caster_id = 14; * @return this */ public SceneCastSkillCsReq clearCasterId() { @@ -116,7 +116,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 caster_id = 13; + * optional uint32 caster_id = 14; * @return the casterId */ public int getCasterId() { @@ -124,7 +124,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 caster_id = 13; + * optional uint32 caster_id = 14; * @param value the casterId to set * @return this */ @@ -135,44 +135,44 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 skill_index = 15; - * @return whether the skillIndex field is set + * optional uint32 attacked_group_id = 15; + * @return whether the attackedGroupId field is set */ - public boolean hasSkillIndex() { + public boolean hasAttackedGroupId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 skill_index = 15; + * optional uint32 attacked_group_id = 15; * @return this */ - public SceneCastSkillCsReq clearSkillIndex() { + public SceneCastSkillCsReq clearAttackedGroupId() { bitField0_ &= ~0x00000004; - skillIndex = 0; + attackedGroupId = 0; return this; } /** - * optional uint32 skill_index = 15; - * @return the skillIndex + * optional uint32 attacked_group_id = 15; + * @return the attackedGroupId */ - public int getSkillIndex() { - return skillIndex; + public int getAttackedGroupId() { + return attackedGroupId; } /** - * optional uint32 skill_index = 15; - * @param value the skillIndex to set + * optional uint32 attacked_group_id = 15; + * @param value the attackedGroupId to set * @return this */ - public SceneCastSkillCsReq setSkillIndex(final int value) { + public SceneCastSkillCsReq setAttackedGroupId(final int value) { bitField0_ |= 0x00000004; - skillIndex = value; + attackedGroupId = value; return this; } /** - * optional .MotionInfo target_motion = 12; + * optional .MotionInfo target_motion = 5; * @return whether the targetMotion field is set */ public boolean hasTargetMotion() { @@ -180,7 +180,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 12; + * optional .MotionInfo target_motion = 5; * @return this */ public SceneCastSkillCsReq clearTargetMotion() { @@ -190,7 +190,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 12; + * optional .MotionInfo target_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. @@ -204,7 +204,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 12; + * optional .MotionInfo target_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 @@ -218,7 +218,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 12; + * optional .MotionInfo target_motion = 5; * @param value the targetMotion to set * @return this */ @@ -229,7 +229,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 10; * @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 = 2; + * repeated uint32 hit_target_entity_id_list = 10; * @return this */ public SceneCastSkillCsReq clearHitTargetEntityIdList() { @@ -247,7 +247,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_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. @@ -261,7 +261,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_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,7 +275,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 10; * @param value the hitTargetEntityIdList to add * @return this */ @@ -286,7 +286,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 2; + * repeated uint32 hit_target_entity_id_list = 10; * @param values the hitTargetEntityIdList to add * @return this */ @@ -297,7 +297,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 4; + * repeated .AssistMonsterWave assist_monster_wave_list = 12; * @return whether the assistMonsterWaveList field is set */ public boolean hasAssistMonsterWaveList() { @@ -305,7 +305,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 4; + * repeated .AssistMonsterWave assist_monster_wave_list = 12; * @return this */ public SceneCastSkillCsReq clearAssistMonsterWaveList() { @@ -315,7 +315,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 4; + * repeated .AssistMonsterWave assist_monster_wave_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. @@ -330,7 +330,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 4; + * repeated .AssistMonsterWave assist_monster_wave_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 @@ -345,7 +345,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 4; + * repeated .AssistMonsterWave assist_monster_wave_list = 12; * @param value the assistMonsterWaveList to add * @return this */ @@ -357,7 +357,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 4; + * repeated .AssistMonsterWave assist_monster_wave_list = 12; * @param values the assistMonsterWaveList to add * @return this */ @@ -373,9 +373,9 @@ public final class SceneCastSkillCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - attackedGroupId = other.attackedGroupId; - casterId = other.casterId; skillIndex = other.skillIndex; + casterId = other.casterId; + attackedGroupId = other.attackedGroupId; targetMotion.copyFrom(other.targetMotion); hitTargetEntityIdList.copyFrom(other.hitTargetEntityIdList); assistMonsterWaveList.copyFrom(other.assistMonsterWaveList); @@ -389,14 +389,14 @@ public final class SceneCastSkillCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasAttackedGroupId()) { - setAttackedGroupId(other.attackedGroupId); + if (other.hasSkillIndex()) { + setSkillIndex(other.skillIndex); } if (other.hasCasterId()) { setCasterId(other.casterId); } - if (other.hasSkillIndex()) { - setSkillIndex(other.skillIndex); + if (other.hasAttackedGroupId()) { + setAttackedGroupId(other.attackedGroupId); } if (other.hasTargetMotion()) { getMutableTargetMotion().mergeFrom(other.targetMotion); @@ -417,9 +417,9 @@ public final class SceneCastSkillCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - attackedGroupId = 0; - casterId = 0; skillIndex = 0; + casterId = 0; + attackedGroupId = 0; targetMotion.clear(); hitTargetEntityIdList.clear(); assistMonsterWaveList.clear(); @@ -449,9 +449,9 @@ public final class SceneCastSkillCsReqOuterClass { } SceneCastSkillCsReq other = (SceneCastSkillCsReq) o; return bitField0_ == other.bitField0_ - && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) - && (!hasCasterId() || casterId == other.casterId) && (!hasSkillIndex() || skillIndex == other.skillIndex) + && (!hasCasterId() || casterId == other.casterId) + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!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) 80); - output.writeUInt32NoTag(attackedGroupId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(skillIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(casterId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(skillIndex); + output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(targetMotion); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < hitTargetEntityIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(hitTargetEntityIdList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < assistMonsterWaveList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 98); output.writeMessageNoTag(assistMonsterWaveList.get(i)); } } @@ -493,13 +493,13 @@ public final class SceneCastSkillCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(targetMotion); @@ -520,16 +520,16 @@ public final class SceneCastSkillCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // attackedGroupId - attackedGroupId = input.readUInt32(); + case 32: { + // skillIndex + skillIndex = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { + case 112: { // casterId casterId = input.readUInt32(); bitField0_ |= 0x00000002; @@ -539,33 +539,33 @@ public final class SceneCastSkillCsReqOuterClass { } } case 120: { - // skillIndex - skillIndex = input.readUInt32(); + // attackedGroupId + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // targetMotion + input.readMessage(targetMotion); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // hitTargetEntityIdList [packed=true] + input.readPackedUInt32(hitTargetEntityIdList, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 98) { break; } } case 98: { - // 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 != 34) { - break; - } - } - case 34: { // assistMonsterWaveList tag = input.readRepeatedMessage(assistMonsterWaveList, tag); bitField0_ |= 0x00000020; @@ -583,7 +583,7 @@ public final class SceneCastSkillCsReqOuterClass { tag = input.readTag(); break; } - case 16: { + case 80: { // hitTargetEntityIdList [packed=false] tag = input.readRepeatedUInt32(hitTargetEntityIdList, tag); bitField0_ |= 0x00000010; @@ -597,13 +597,13 @@ public final class SceneCastSkillCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + output.writeUInt32(FieldNames.skillIndex, skillIndex); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.casterId, casterId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.skillIndex, skillIndex); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.targetMotion, targetMotion); @@ -624,11 +624,11 @@ public final class SceneCastSkillCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 1587034369: + case -1716021916: { + if (input.isAtField(FieldNames.skillIndex)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + skillIndex = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -648,11 +648,11 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case 1587034369: - case -1716021916: { - if (input.isAtField(FieldNames.skillIndex)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - skillIndex = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -749,11 +749,11 @@ public final class SceneCastSkillCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); + static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); static final FieldName casterId = FieldName.forField("casterId", "caster_id"); - static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); + static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); static final FieldName targetMotion = FieldName.forField("targetMotion", "target_motion"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java index 0d7382c..2c055e5 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java @@ -19,15 +19,15 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 mp = 4; - */ - private int mp; - - /** - * optional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 10; */ private int attackedGroupId; + /** + * optional uint32 mp = 14; + */ + private int mp; + private SceneCastSkillMpUpdateScNotify() { } @@ -39,62 +39,25 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 4; - * @return whether the mp field is set + * optional uint32 attacked_group_id = 10; + * @return whether the attackedGroupId field is set */ - public boolean hasMp() { + public boolean hasAttackedGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 mp = 4; - * @return this - */ - public SceneCastSkillMpUpdateScNotify clearMp() { - bitField0_ &= ~0x00000001; - mp = 0; - return this; - } - - /** - * optional uint32 mp = 4; - * @return the mp - */ - public int getMp() { - return mp; - } - - /** - * optional uint32 mp = 4; - * @param value the mp to set - * @return this - */ - public SceneCastSkillMpUpdateScNotify setMp(final int value) { - bitField0_ |= 0x00000001; - mp = value; - return this; - } - - /** - * optional uint32 attacked_group_id = 5; - * @return whether the attackedGroupId field is set - */ - public boolean hasAttackedGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 10; * @return this */ public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; attackedGroupId = 0; return this; } /** - * optional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 10; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -102,23 +65,60 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 5; + * optional uint32 attacked_group_id = 10; * @param value the attackedGroupId to set * @return this */ public SceneCastSkillMpUpdateScNotify setAttackedGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; attackedGroupId = value; return this; } + /** + * optional uint32 mp = 14; + * @return whether the mp field is set + */ + public boolean hasMp() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 mp = 14; + * @return this + */ + public SceneCastSkillMpUpdateScNotify clearMp() { + bitField0_ &= ~0x00000002; + mp = 0; + return this; + } + + /** + * optional uint32 mp = 14; + * @return the mp + */ + public int getMp() { + return mp; + } + + /** + * optional uint32 mp = 14; + * @param value the mp to set + * @return this + */ + public SceneCastSkillMpUpdateScNotify setMp(final int value) { + bitField0_ |= 0x00000002; + mp = value; + return this; + } + @Override public SceneCastSkillMpUpdateScNotify copyFrom(final SceneCastSkillMpUpdateScNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mp = other.mp; attackedGroupId = other.attackedGroupId; + mp = other.mp; } return this; } @@ -129,12 +129,12 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasMp()) { - setMp(other.mp); - } if (other.hasAttackedGroupId()) { setAttackedGroupId(other.attackedGroupId); } + if (other.hasMp()) { + setMp(other.mp); + } return this; } @@ -145,8 +145,8 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - mp = 0; attackedGroupId = 0; + mp = 0; return this; } @@ -170,19 +170,19 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } SceneCastSkillMpUpdateScNotify other = (SceneCastSkillMpUpdateScNotify) o; return bitField0_ == other.bitField0_ - && (!hasMp() || mp == other.mp) - && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId); + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) + && (!hasMp() || mp == other.mp); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(mp); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(attackedGroupId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(mp); } } @@ -190,10 +190,10 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); } return size; } @@ -205,18 +205,18 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // mp - mp = input.readUInt32(); + case 80: { + // attackedGroupId + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 112) { break; } } - case 40: { - // attackedGroupId - attackedGroupId = input.readUInt32(); + case 112: { + // mp + mp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mp, mp); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + output.writeUInt32(FieldNames.mp, mp); } output.endObject(); } @@ -256,10 +256,11 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3491: { - if (input.isAtField(FieldNames.mp)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - mp = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } break; } - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 3491: { + if (input.isAtField(FieldNames.mp)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + mp = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -334,9 +334,9 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mp = FieldName.forField("mp"); - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); + + static final FieldName mp = FieldName.forField("mp"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillOuterClass.java index 0684275..6181856 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillOuterClass.java @@ -67,7 +67,7 @@ public final class SceneCastSkillOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return SceneCastSkillConverter.INSTANCE; } @@ -89,7 +89,7 @@ public final class SceneCastSkillOuterClass { return value == null ? other : value; } - enum SceneCastSkillConverter implements EnumConverter { + enum SceneCastSkillConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final SceneCastSkill[] lookup = new SceneCastSkill[3]; diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java index 33f1538..096e223 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 retcode = 2; - */ - private int retcode; - - /** - * optional uint32 attacked_group_id = 6; + * optional uint32 attacked_group_id = 10; */ private int attackedGroupId; /** - * optional .SceneBattleInfo battle_info = 9; + * optional uint32 retcode = 14; + */ + private int retcode; + + /** + * optional .SceneBattleInfo battle_info = 13; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,62 +44,25 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 2; - * @return whether the retcode field is set + * optional uint32 attacked_group_id = 10; + * @return whether the attackedGroupId field is set */ - public boolean hasRetcode() { + public boolean hasAttackedGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 2; - * @return this - */ - public SceneCastSkillScRsp 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 SceneCastSkillScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 attacked_group_id = 6; - * @return whether the attackedGroupId field is set - */ - public boolean hasAttackedGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 attacked_group_id = 6; + * optional uint32 attacked_group_id = 10; * @return this */ public SceneCastSkillScRsp clearAttackedGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; attackedGroupId = 0; return this; } /** - * optional uint32 attacked_group_id = 6; + * optional uint32 attacked_group_id = 10; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -107,18 +70,55 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 6; + * optional uint32 attacked_group_id = 10; * @param value the attackedGroupId to set * @return this */ public SceneCastSkillScRsp setAttackedGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; attackedGroupId = value; return this; } /** - * optional .SceneBattleInfo battle_info = 9; + * optional uint32 retcode = 14; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 14; + * @return this + */ + public SceneCastSkillScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 14; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 14; + * @param value the retcode to set + * @return this + */ + public SceneCastSkillScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .SceneBattleInfo battle_info = 13; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 9; + * optional .SceneBattleInfo battle_info = 13; * @return this */ public SceneCastSkillScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 9; + * optional .SceneBattleInfo battle_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 SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 9; + * optional .SceneBattleInfo battle_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 SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 9; + * optional .SceneBattleInfo battle_info = 13; * @param value the battleInfo to set * @return this */ @@ -180,8 +180,8 @@ public final class SceneCastSkillScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; attackedGroupId = other.attackedGroupId; + retcode = other.retcode; battleInfo.copyFrom(other.battleInfo); } return this; @@ -193,12 +193,12 @@ public final class SceneCastSkillScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasAttackedGroupId()) { setAttackedGroupId(other.attackedGroupId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasBattleInfo()) { getMutableBattleInfo().mergeFrom(other.battleInfo); } @@ -212,8 +212,8 @@ public final class SceneCastSkillScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; attackedGroupId = 0; + retcode = 0; battleInfo.clear(); return this; } @@ -239,23 +239,23 @@ public final class SceneCastSkillScRspOuterClass { } SceneCastSkillScRsp other = (SceneCastSkillScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) + && (!hasRetcode() || retcode == other.retcode) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(attackedGroupId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); output.writeMessageNoTag(battleInfo); } } @@ -264,10 +264,10 @@ public final class SceneCastSkillScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo); @@ -282,25 +282,25 @@ public final class SceneCastSkillScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 80: { // attackedGroupId attackedGroupId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 112) { break; } } - case 74: { + case 112: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; @@ -327,10 +327,10 @@ public final class SceneCastSkillScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); @@ -345,10 +345,11 @@ public final class SceneCastSkillScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +357,10 @@ public final class SceneCastSkillScRspOuterClass { } break; } - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public final class SceneCastSkillScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java index 5de2651..1a477ab 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 = 7; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 12; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * 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 SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 10; * @return this */ public SceneEnterStageScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 12; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -84,7 +84,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 12; * @return this */ public SceneEnterStageScRsp clearBattleInfo() { @@ -94,7 +94,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_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. @@ -108,7 +108,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_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 @@ -122,7 +122,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 15; + * optional .SceneBattleInfo battle_info = 12; * @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) 56); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 98); output.writeMessageNoTag(battleInfo); } } @@ -227,16 +227,16 @@ public final class SceneEnterStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 98) { break; } } - case 122: { + case 98: { // 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 a9ac36f..b9ea012 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 = 2; + * optional uint32 group_id = 3; */ private int groupId; /** - * optional uint32 state = 6; + * optional uint32 state = 4; */ private int state; /** - * repeated .SceneEntityInfo entity_list = 12; + * repeated .SceneEntityInfo entity_list = 8; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); @@ -45,7 +45,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 3; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -53,7 +53,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 3; * @return this */ public SceneEntityGroupInfo clearGroupId() { @@ -63,7 +63,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 3; * @return the groupId */ public int getGroupId() { @@ -71,7 +71,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 3; * @param value the groupId to set * @return this */ @@ -82,7 +82,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 4; * @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 = 4; * @return this */ public SceneEntityGroupInfo clearState() { @@ -100,7 +100,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 4; * @return the state */ public int getState() { @@ -108,7 +108,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 4; * @param value the state to set * @return this */ @@ -119,7 +119,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 12; + * repeated .SceneEntityInfo entity_list = 8; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -127,7 +127,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 12; + * repeated .SceneEntityInfo entity_list = 8; * @return this */ public SceneEntityGroupInfo clearEntityList() { @@ -137,7 +137,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 12; + * repeated .SceneEntityInfo entity_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 +151,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 12; + * repeated .SceneEntityInfo entity_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 @@ -165,7 +165,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 12; + * repeated .SceneEntityInfo entity_list = 8; * @param value the entityList to add * @return this */ @@ -177,7 +177,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 12; + * repeated .SceneEntityInfo entity_list = 8; * @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) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 66); output.writeMessageNoTag(entityList.get(i)); } } @@ -297,25 +297,25 @@ public final class SceneEntityGroupInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 32) { break; } } - case 48: { + case 32: { // state state = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { + if (tag != 66) { break; } } - case 98: { + case 66: { // 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 81fc7d6..99cc0f0 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java @@ -24,39 +24,39 @@ public final class SceneEntityInfoOuterClass { private int entityId; /** - * optional uint32 inst_id = 8; - */ - private int instId; - - /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 9; */ private int groupId; /** - * optional .SceneNpcMonsterInfo npc_monster = 2; + * optional uint32 inst_id = 13; */ - private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); + private int instId; /** - * optional .SceneNpcInfo npc = 5; + * optional .MotionInfo motion = 1; */ - private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * optional .SceneActorInfo actor = 6; - */ - private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); - - /** - * optional .ScenePropInfo prop = 10; + * optional .ScenePropInfo prop = 8; */ private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance(); /** - * optional .MotionInfo motion = 13; + * optional .SceneActorInfo actor = 10; */ - private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); + + /** + * optional .SceneNpcInfo npc = 11; + */ + private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); + + /** + * optional .SceneNpcMonsterInfo npc_monster = 14; + */ + private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); /** * optional .SceneSummonUnitInfo summon_unit = 15; @@ -111,62 +111,25 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 inst_id = 8; - * @return whether the instId field is set + * optional uint32 group_id = 9; + * @return whether the groupId field is set */ - public boolean hasInstId() { + public boolean hasGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 inst_id = 8; - * @return this - */ - public SceneEntityInfo clearInstId() { - bitField0_ &= ~0x00000002; - instId = 0; - return this; - } - - /** - * optional uint32 inst_id = 8; - * @return the instId - */ - public int getInstId() { - return instId; - } - - /** - * optional uint32 inst_id = 8; - * @param value the instId to set - * @return this - */ - public SceneEntityInfo setInstId(final int value) { - bitField0_ |= 0x00000002; - instId = value; - return this; - } - - /** - * optional uint32 group_id = 14; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 9; * @return this */ public SceneEntityInfo clearGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; groupId = 0; return this; } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 9; * @return the groupId */ public int getGroupId() { @@ -174,265 +137,73 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 9; * @param value the groupId to set * @return this */ public SceneEntityInfo setGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; groupId = value; return this; } /** - * optional .SceneNpcMonsterInfo npc_monster = 2; - * @return whether the npcMonster field is set + * optional uint32 inst_id = 13; + * @return whether the instId field is set */ - public boolean hasNpcMonster() { + public boolean hasInstId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 inst_id = 13; + * @return this + */ + public SceneEntityInfo clearInstId() { + bitField0_ &= ~0x00000004; + instId = 0; + return this; + } + + /** + * optional uint32 inst_id = 13; + * @return the instId + */ + public int getInstId() { + return instId; + } + + /** + * optional uint32 inst_id = 13; + * @param value the instId to set + * @return this + */ + public SceneEntityInfo setInstId(final int value) { + bitField0_ |= 0x00000004; + instId = value; + return this; + } + + /** + * optional .MotionInfo motion = 1; + * @return whether the motion field is set + */ + public boolean hasMotion() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .SceneNpcMonsterInfo npc_monster = 2; - * @return this - */ - public SceneEntityInfo clearNpcMonster() { - bitField0_ &= ~0x00000008; - npcMonster.clear(); - return this; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 2; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableNpcMonster()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getNpcMonster() { - return npcMonster; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getMutableNpcMonster() { - bitField0_ |= 0x00000008; - return npcMonster; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 2; - * @param value the npcMonster to set - * @return this - */ - public SceneEntityInfo setNpcMonster( - final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo value) { - bitField0_ |= 0x00000008; - npcMonster.copyFrom(value); - return this; - } - - /** - * optional .SceneNpcInfo npc = 5; - * @return whether the npc field is set - */ - public boolean hasNpc() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .SceneNpcInfo npc = 5; - * @return this - */ - public SceneEntityInfo clearNpc() { - bitField0_ &= ~0x00000010; - npc.clear(); - return this; - } - - /** - * optional .SceneNpcInfo npc = 5; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableNpc()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { - return npc; - } - - /** - * optional .SceneNpcInfo npc = 5; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { - bitField0_ |= 0x00000010; - return npc; - } - - /** - * optional .SceneNpcInfo npc = 5; - * @param value the npc to set - * @return this - */ - public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { - bitField0_ |= 0x00000010; - npc.copyFrom(value); - return this; - } - - /** - * optional .SceneActorInfo actor = 6; - * @return whether the actor field is set - */ - public boolean hasActor() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .SceneActorInfo actor = 6; - * @return this - */ - public SceneEntityInfo clearActor() { - bitField0_ &= ~0x00000020; - actor.clear(); - return this; - } - - /** - * optional .SceneActorInfo actor = 6; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableActor()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneActorInfoOuterClass.SceneActorInfo getActor() { - return actor; - } - - /** - * optional .SceneActorInfo actor = 6; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * 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 = 6; - * @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_ &= ~0x00000040; - prop.clear(); - return this; - } - - /** - * 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. - * - * Use {@link #getMutableProp()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ScenePropInfoOuterClass.ScenePropInfo getProp() { - return prop; - } - - /** - * 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ScenePropInfoOuterClass.ScenePropInfo getMutableProp() { - bitField0_ |= 0x00000040; - return prop; - } - - /** - * optional .ScenePropInfo prop = 10; - * @param value the prop to set - * @return this - */ - public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) { - bitField0_ |= 0x00000040; - prop.copyFrom(value); - return this; - } - - /** - * optional .MotionInfo motion = 13; - * @return whether the motion field is set - */ - public boolean hasMotion() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 1; * @return this */ public SceneEntityInfo clearMotion() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000008; motion.clear(); return this; } /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 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. @@ -446,7 +217,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 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 @@ -455,21 +226,250 @@ public final class SceneEntityInfoOuterClass { * @return internal storage object for modifications */ public MotionInfoOuterClass.MotionInfo getMutableMotion() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; return motion; } /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 1; * @param value the motion to set * @return this */ public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; motion.copyFrom(value); return this; } + /** + * optional .ScenePropInfo prop = 8; + * @return whether the prop field is set + */ + public boolean hasProp() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .ScenePropInfo prop = 8; + * @return this + */ + public SceneEntityInfo clearProp() { + bitField0_ &= ~0x00000010; + prop.clear(); + return this; + } + + /** + * optional .ScenePropInfo prop = 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 #getMutableProp()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ScenePropInfoOuterClass.ScenePropInfo getProp() { + return prop; + } + + /** + * optional .ScenePropInfo prop = 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 ScenePropInfoOuterClass.ScenePropInfo getMutableProp() { + bitField0_ |= 0x00000010; + return prop; + } + + /** + * optional .ScenePropInfo prop = 8; + * @param value the prop to set + * @return this + */ + public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) { + bitField0_ |= 0x00000010; + prop.copyFrom(value); + return this; + } + + /** + * optional .SceneActorInfo actor = 10; + * @return whether the actor field is set + */ + public boolean hasActor() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .SceneActorInfo actor = 10; + * @return this + */ + public SceneEntityInfo clearActor() { + bitField0_ &= ~0x00000020; + actor.clear(); + return this; + } + + /** + * optional .SceneActorInfo actor = 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 #getMutableActor()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneActorInfoOuterClass.SceneActorInfo getActor() { + return actor; + } + + /** + * optional .SceneActorInfo actor = 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 SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { + bitField0_ |= 0x00000020; + return actor; + } + + /** + * optional .SceneActorInfo actor = 10; + * @param value the actor to set + * @return this + */ + public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { + bitField0_ |= 0x00000020; + actor.copyFrom(value); + return this; + } + + /** + * optional .SceneNpcInfo npc = 11; + * @return whether the npc field is set + */ + public boolean hasNpc() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional .SceneNpcInfo npc = 11; + * @return this + */ + public SceneEntityInfo clearNpc() { + bitField0_ &= ~0x00000040; + npc.clear(); + return this; + } + + /** + * optional .SceneNpcInfo npc = 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 #getMutableNpc()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { + return npc; + } + + /** + * optional .SceneNpcInfo npc = 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 SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { + bitField0_ |= 0x00000040; + return npc; + } + + /** + * optional .SceneNpcInfo npc = 11; + * @param value the npc to set + * @return this + */ + public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { + bitField0_ |= 0x00000040; + npc.copyFrom(value); + return this; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 14; + * @return whether the npcMonster field is set + */ + public boolean hasNpcMonster() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 14; + * @return this + */ + public SceneEntityInfo clearNpcMonster() { + bitField0_ &= ~0x00000080; + npcMonster.clear(); + return this; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 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 #getMutableNpcMonster()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getNpcMonster() { + return npcMonster; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 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 SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getMutableNpcMonster() { + bitField0_ |= 0x00000080; + return npcMonster; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 14; + * @param value the npcMonster to set + * @return this + */ + public SceneEntityInfo setNpcMonster( + final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo value) { + bitField0_ |= 0x00000080; + npcMonster.copyFrom(value); + return this; + } + /** * optional .SceneSummonUnitInfo summon_unit = 15; * @return whether the summonUnit field is set @@ -534,13 +534,13 @@ public final class SceneEntityInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; entityId = other.entityId; - instId = other.instId; groupId = other.groupId; - npcMonster.copyFrom(other.npcMonster); - npc.copyFrom(other.npc); - actor.copyFrom(other.actor); - prop.copyFrom(other.prop); + instId = other.instId; motion.copyFrom(other.motion); + prop.copyFrom(other.prop); + actor.copyFrom(other.actor); + npc.copyFrom(other.npc); + npcMonster.copyFrom(other.npcMonster); summonUnit.copyFrom(other.summonUnit); } return this; @@ -555,26 +555,26 @@ public final class SceneEntityInfoOuterClass { if (other.hasEntityId()) { setEntityId(other.entityId); } - if (other.hasInstId()) { - setInstId(other.instId); - } if (other.hasGroupId()) { setGroupId(other.groupId); } - if (other.hasNpcMonster()) { - getMutableNpcMonster().mergeFrom(other.npcMonster); + if (other.hasInstId()) { + setInstId(other.instId); } - if (other.hasNpc()) { - getMutableNpc().mergeFrom(other.npc); - } - if (other.hasActor()) { - getMutableActor().mergeFrom(other.actor); + if (other.hasMotion()) { + getMutableMotion().mergeFrom(other.motion); } if (other.hasProp()) { getMutableProp().mergeFrom(other.prop); } - if (other.hasMotion()) { - getMutableMotion().mergeFrom(other.motion); + if (other.hasActor()) { + getMutableActor().mergeFrom(other.actor); + } + if (other.hasNpc()) { + getMutableNpc().mergeFrom(other.npc); + } + if (other.hasNpcMonster()) { + getMutableNpcMonster().mergeFrom(other.npcMonster); } if (other.hasSummonUnit()) { getMutableSummonUnit().mergeFrom(other.summonUnit); @@ -590,13 +590,13 @@ public final class SceneEntityInfoOuterClass { cachedSize = -1; bitField0_ = 0; entityId = 0; - instId = 0; groupId = 0; - npcMonster.clear(); - npc.clear(); - actor.clear(); - prop.clear(); + instId = 0; motion.clear(); + prop.clear(); + actor.clear(); + npc.clear(); + npcMonster.clear(); summonUnit.clear(); return this; } @@ -608,11 +608,11 @@ public final class SceneEntityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - npcMonster.clearQuick(); - npc.clearQuick(); - actor.clearQuick(); - prop.clearQuick(); motion.clearQuick(); + prop.clearQuick(); + actor.clearQuick(); + npc.clearQuick(); + npcMonster.clearQuick(); summonUnit.clearQuick(); return this; } @@ -628,13 +628,13 @@ public final class SceneEntityInfoOuterClass { SceneEntityInfo other = (SceneEntityInfo) o; return bitField0_ == other.bitField0_ && (!hasEntityId() || entityId == other.entityId) - && (!hasInstId() || instId == other.instId) && (!hasGroupId() || groupId == other.groupId) - && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)) - && (!hasNpc() || npc.equals(other.npc)) - && (!hasActor() || actor.equals(other.actor)) - && (!hasProp() || prop.equals(other.prop)) + && (!hasInstId() || instId == other.instId) && (!hasMotion() || motion.equals(other.motion)) + && (!hasProp() || prop.equals(other.prop)) + && (!hasActor() || actor.equals(other.actor)) + && (!hasNpc() || npc.equals(other.npc)) + && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)) && (!hasSummonUnit() || summonUnit.equals(other.summonUnit)); } @@ -645,32 +645,32 @@ public final class SceneEntityInfoOuterClass { output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(instId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(groupId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(instId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(npcMonster); + output.writeRawByte((byte) 10); + output.writeMessageNoTag(motion); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(npc); + output.writeRawByte((byte) 66); + output.writeMessageNoTag(prop); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 82); output.writeMessageNoTag(actor); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(prop); + output.writeRawByte((byte) 90); + output.writeMessageNoTag(npc); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(motion); + output.writeRawByte((byte) 114); + output.writeMessageNoTag(npcMonster); } if ((bitField0_ & 0x00000100) != 0) { output.writeRawByte((byte) 122); @@ -685,25 +685,25 @@ public final class SceneEntityInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); + size += 1 + ProtoSink.computeMessageSizeNoTag(motion); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npc); + size += 1 + ProtoSink.computeMessageSizeNoTag(prop); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(actor); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(prop); + size += 1 + ProtoSink.computeMessageSizeNoTag(npc); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(motion); + size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); } if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(summonUnit); @@ -723,67 +723,67 @@ public final class SceneEntityInfoOuterClass { entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { - // instId - instId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 72: { // groupId groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // instId + instId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { - // npcMonster - input.readMessage(npcMonster); + case 10: { + // motion + input.readMessage(motion); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 42) { + if (tag != 66) { break; } } - case 42: { - // npc - input.readMessage(npc); + case 66: { + // prop + input.readMessage(prop); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // actor - input.readMessage(actor); - bitField0_ |= 0x00000020; - tag = input.readTag(); if (tag != 82) { break; } } case 82: { - // prop - input.readMessage(prop); - bitField0_ |= 0x00000040; + // actor + input.readMessage(actor); + bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 106) { + if (tag != 90) { break; } } - case 106: { - // motion - input.readMessage(motion); + case 90: { + // npc + input.readMessage(npc); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // npcMonster + input.readMessage(npcMonster); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 122) { @@ -820,25 +820,25 @@ public final class SceneEntityInfoOuterClass { output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.instId, instId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.groupId, groupId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.instId, instId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.npcMonster, npcMonster); + output.writeMessage(FieldNames.motion, motion); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.npc, npc); + output.writeMessage(FieldNames.prop, prop); } if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.actor, actor); } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.prop, prop); + output.writeMessage(FieldNames.npc, npc); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.motion, motion); + output.writeMessage(FieldNames.npcMonster, npcMonster); } if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.summonUnit, summonUnit); @@ -865,11 +865,11 @@ public final class SceneEntityInfoOuterClass { } break; } - case -1183779327: - case 1957567924: { - if (input.isAtField(FieldNames.instId)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - instId = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -877,11 +877,11 @@ public final class SceneEntityInfoOuterClass { } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case -1183779327: + case 1957567924: { + if (input.isAtField(FieldNames.instId)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + instId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -889,11 +889,10 @@ public final class SceneEntityInfoOuterClass { } break; } - case -1367251527: - case 119679100: { - if (input.isAtField(FieldNames.npcMonster)) { + case -1068318794: { + if (input.isAtField(FieldNames.motion)) { if (!input.trySkipNullValue()) { - input.readMessage(npcMonster); + input.readMessage(motion); bitField0_ |= 0x00000008; } } else { @@ -901,10 +900,10 @@ public final class SceneEntityInfoOuterClass { } break; } - case 109281: { - if (input.isAtField(FieldNames.npc)) { + case 3449699: { + if (input.isAtField(FieldNames.prop)) { if (!input.trySkipNullValue()) { - input.readMessage(npc); + input.readMessage(prop); bitField0_ |= 0x00000010; } } else { @@ -923,10 +922,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_ |= 0x00000040; } } else { @@ -934,10 +933,11 @@ public final class SceneEntityInfoOuterClass { } break; } - case -1068318794: { - if (input.isAtField(FieldNames.motion)) { + case -1367251527: + case 119679100: { + if (input.isAtField(FieldNames.npcMonster)) { if (!input.trySkipNullValue()) { - input.readMessage(motion); + input.readMessage(npcMonster); bitField0_ |= 0x00000080; } } else { @@ -1012,19 +1012,19 @@ public final class SceneEntityInfoOuterClass { static class FieldNames { static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName instId = FieldName.forField("instId", "inst_id"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); + static final FieldName instId = FieldName.forField("instId", "inst_id"); - static final FieldName npc = FieldName.forField("npc"); - - static final FieldName actor = FieldName.forField("actor"); + static final FieldName motion = FieldName.forField("motion"); static final FieldName prop = FieldName.forField("prop"); - static final FieldName motion = FieldName.forField("motion"); + static final FieldName actor = FieldName.forField("actor"); + + static final FieldName npc = FieldName.forField("npc"); + + static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); 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 4f3a69a..328b898 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class SceneEntityMoveCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 3; */ private int entryId; /** - * repeated .EntityMotion entity_motion_list = 12; + * repeated .EntityMotion entity_motion_list = 15; */ private final RepeatedMessage entityMotionList = RepeatedMessage.newEmptyInstance(EntityMotionOuterClass.EntityMotion.getFactory()); @@ -40,7 +40,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 3; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -48,7 +48,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 3; * @return this */ public SceneEntityMoveCsReq clearEntryId() { @@ -58,7 +58,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 3; * @return the entryId */ public int getEntryId() { @@ -66,7 +66,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 3; * @param value the entryId to set * @return this */ @@ -77,7 +77,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 12; + * repeated .EntityMotion entity_motion_list = 15; * @return whether the entityMotionList field is set */ public boolean hasEntityMotionList() { @@ -85,7 +85,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 12; + * repeated .EntityMotion entity_motion_list = 15; * @return this */ public SceneEntityMoveCsReq clearEntityMotionList() { @@ -95,7 +95,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 12; + * repeated .EntityMotion entity_motion_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 SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 12; + * repeated .EntityMotion entity_motion_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 SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 12; + * repeated .EntityMotion entity_motion_list = 15; * @param value the entityMotionList to add * @return this */ @@ -135,7 +135,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 12; + * repeated .EntityMotion entity_motion_list = 15; * @param values the entityMotionList to add * @return this */ @@ -212,12 +212,12 @@ public final class SceneEntityMoveCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entityMotionList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 122); output.writeMessageNoTag(entityMotionList.get(i)); } } @@ -242,16 +242,16 @@ public final class SceneEntityMoveCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 24: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 122) { break; } } - case 98: { + case 122: { // 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 76b9414..ce21e19 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 = 10; - */ - private int clientPosVersion; - - /** - * optional uint32 entity_id = 11; - */ - private int entityId; - - /** - * optional uint32 entry_id = 13; + * optional uint32 entry_id = 7; */ private int entryId; /** - * optional .MotionInfo motion = 4; + * optional uint32 client_pos_version = 9; + */ + private int clientPosVersion; + + /** + * optional uint32 entity_id = 10; + */ + private int entityId; + + /** + * optional .MotionInfo motion = 15; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -49,99 +49,25 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 client_pos_version = 10; - * @return whether the clientPosVersion field is set + * optional uint32 entry_id = 7; + * @return whether the entryId field is set */ - public boolean hasClientPosVersion() { + public boolean hasEntryId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 client_pos_version = 10; - * @return this - */ - public SceneEntityMoveScNotify clearClientPosVersion() { - bitField0_ &= ~0x00000001; - clientPosVersion = 0; - return this; - } - - /** - * optional uint32 client_pos_version = 10; - * @return the clientPosVersion - */ - public int getClientPosVersion() { - return clientPosVersion; - } - - /** - * optional uint32 client_pos_version = 10; - * @param value the clientPosVersion to set - * @return this - */ - public SceneEntityMoveScNotify setClientPosVersion(final int value) { - bitField0_ |= 0x00000001; - clientPosVersion = value; - return this; - } - - /** - * optional uint32 entity_id = 11; - * @return whether the entityId field is set - */ - public boolean hasEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entity_id = 11; - * @return this - */ - public SceneEntityMoveScNotify clearEntityId() { - bitField0_ &= ~0x00000002; - entityId = 0; - return this; - } - - /** - * optional uint32 entity_id = 11; - * @return the entityId - */ - public int getEntityId() { - return entityId; - } - - /** - * optional uint32 entity_id = 11; - * @param value the entityId to set - * @return this - */ - public SceneEntityMoveScNotify setEntityId(final int value) { - bitField0_ |= 0x00000002; - entityId = value; - return this; - } - - /** - * optional uint32 entry_id = 13; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 entry_id = 13; + * optional uint32 entry_id = 7; * @return this */ public SceneEntityMoveScNotify clearEntryId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; entryId = 0; return this; } /** - * optional uint32 entry_id = 13; + * optional uint32 entry_id = 7; * @return the entryId */ public int getEntryId() { @@ -149,18 +75,92 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entry_id = 13; + * optional uint32 entry_id = 7; * @param value the entryId to set * @return this */ public SceneEntityMoveScNotify setEntryId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; entryId = value; return this; } /** - * optional .MotionInfo motion = 4; + * optional uint32 client_pos_version = 9; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 client_pos_version = 9; + * @return this + */ + public SceneEntityMoveScNotify clearClientPosVersion() { + bitField0_ &= ~0x00000002; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 9; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 9; + * @param value the clientPosVersion to set + * @return this + */ + public SceneEntityMoveScNotify setClientPosVersion(final int value) { + bitField0_ |= 0x00000002; + clientPosVersion = value; + return this; + } + + /** + * optional uint32 entity_id = 10; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entity_id = 10; + * @return this + */ + public SceneEntityMoveScNotify clearEntityId() { + bitField0_ &= ~0x00000004; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 10; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 10; + * @param value the entityId to set + * @return this + */ + public SceneEntityMoveScNotify setEntityId(final int value) { + bitField0_ |= 0x00000004; + entityId = value; + return this; + } + + /** + * optional .MotionInfo motion = 15; * @return whether the motion field is set */ public boolean hasMotion() { @@ -168,7 +168,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 15; * @return this */ public SceneEntityMoveScNotify clearMotion() { @@ -178,7 +178,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 15; * @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_; + entryId = other.entryId; clientPosVersion = other.clientPosVersion; entityId = other.entityId; - entryId = other.entryId; motion.copyFrom(other.motion); } return this; @@ -235,15 +235,15 @@ public final class SceneEntityMoveScNotifyOuterClass { return this; } cachedSize = -1; + if (other.hasEntryId()) { + setEntryId(other.entryId); + } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } if (other.hasEntityId()) { setEntityId(other.entityId); } - if (other.hasEntryId()) { - setEntryId(other.entryId); - } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } @@ -257,9 +257,9 @@ public final class SceneEntityMoveScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; + entryId = 0; clientPosVersion = 0; entityId = 0; - entryId = 0; motion.clear(); return this; } @@ -285,28 +285,28 @@ public final class SceneEntityMoveScNotifyOuterClass { } SceneEntityMoveScNotify other = (SceneEntityMoveScNotify) o; return bitField0_ == other.bitField0_ + && (!hasEntryId() || entryId == other.entryId) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasEntityId() || entityId == other.entityId) - && (!hasEntryId() || entryId == other.entryId) && (!hasMotion() || motion.equals(other.motion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(entryId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(entityId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 122); 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(entryId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } 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 80: { - // clientPosVersion - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 56: { // entryId entryId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 72) { break; } } - case 34: { + case 72: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { // 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.entryId, entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -411,12 +411,24 @@ public final class SceneEntityMoveScNotifyOuterClass { } 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 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.entityId)) { if (!input.trySkipNullValue()) { entityId = 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 { @@ -511,12 +511,12 @@ public final class SceneEntityMoveScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName motion = FieldName.forField("motion"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java index 97378d8..fbf79c3 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 = 4; + * optional uint32 del_entity = 3; */ private int delEntity; /** - * optional .SceneEntityInfo add_entity = 6; + * optional .SceneEntityInfo add_entity = 5; */ private final SceneEntityInfoOuterClass.SceneEntityInfo addEntity = SceneEntityInfoOuterClass.SceneEntityInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 4; + * optional uint32 del_entity = 3; * @return whether the delEntity field is set */ public boolean hasDelEntity() { @@ -47,7 +47,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 4; + * optional uint32 del_entity = 3; * @return this */ public SceneEntityRefreshInfo clearDelEntity() { @@ -57,7 +57,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 4; + * optional uint32 del_entity = 3; * @return the delEntity */ public int getDelEntity() { @@ -65,7 +65,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 4; + * optional uint32 del_entity = 3; * @param value the delEntity to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 6; + * optional .SceneEntityInfo add_entity = 5; * @return whether the addEntity field is set */ public boolean hasAddEntity() { @@ -84,7 +84,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 6; + * optional .SceneEntityInfo add_entity = 5; * @return this */ public SceneEntityRefreshInfo clearAddEntity() { @@ -94,7 +94,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 6; + * optional .SceneEntityInfo add_entity = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 6; + * optional .SceneEntityInfo add_entity = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 6; + * optional .SceneEntityInfo add_entity = 5; * @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) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(delEntity); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 42); output.writeMessageNoTag(addEntity); } } @@ -227,16 +227,16 @@ public final class SceneEntityRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // delEntity delEntity = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 42) { break; } } - case 50: { + case 42: { // 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 c6c6bd1..6c480b0 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SceneEntityTeleportCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 6; */ private int entryId; @@ -39,7 +39,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 6; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -47,7 +47,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 6; * @return this */ public SceneEntityTeleportCsReq clearEntryId() { @@ -57,7 +57,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 6; * @return the entryId */ public int getEntryId() { @@ -65,7 +65,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 4; + * optional uint32 entry_id = 6; * @param value the entryId to set * @return this */ @@ -199,7 +199,7 @@ public final class SceneEntityTeleportCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { @@ -227,7 +227,7 @@ public final class SceneEntityTeleportCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 48: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java index 8566e24..bed3c10 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java @@ -19,17 +19,17 @@ public final class SceneEntityTeleportScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; - */ - private int retcode; - - /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; */ private int clientPosVersion; /** - * optional .EntityMotion entity_motion = 9; + * optional uint32 retcode = 14; + */ + private int retcode; + + /** + * optional .EntityMotion entity_motion = 13; */ private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); @@ -44,62 +44,25 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set + * optional uint32 client_pos_version = 7; + * @return whether the clientPosVersion field is set */ - public boolean hasRetcode() { + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 6; - * @return this - */ - public SceneEntityTeleportScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 6; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 6; - * @param value the retcode to set - * @return this - */ - public SceneEntityTeleportScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 client_pos_version = 12; - * @return whether the clientPosVersion field is set - */ - public boolean hasClientPosVersion() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; * @return this */ public SceneEntityTeleportScRsp clearClientPosVersion() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; clientPosVersion = 0; return this; } /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -107,18 +70,55 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; * @param value the clientPosVersion to set * @return this */ public SceneEntityTeleportScRsp setClientPosVersion(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; clientPosVersion = value; return this; } /** - * optional .EntityMotion entity_motion = 9; + * optional uint32 retcode = 14; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 14; + * @return this + */ + public SceneEntityTeleportScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 14; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 14; + * @param value the retcode to set + * @return this + */ + public SceneEntityTeleportScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .EntityMotion entity_motion = 13; * @return whether the entityMotion field is set */ public boolean hasEntityMotion() { @@ -126,7 +126,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 9; + * optional .EntityMotion entity_motion = 13; * @return this */ public SceneEntityTeleportScRsp clearEntityMotion() { @@ -136,7 +136,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 9; + * 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. @@ -150,7 +150,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 9; + * 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 @@ -164,7 +164,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 9; + * optional .EntityMotion entity_motion = 13; * @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_; - retcode = other.retcode; clientPosVersion = other.clientPosVersion; + retcode = other.retcode; entityMotion.copyFrom(other.entityMotion); } return this; @@ -193,12 +193,12 @@ public final class SceneEntityTeleportScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasEntityMotion()) { getMutableEntityMotion().mergeFrom(other.entityMotion); } @@ -212,8 +212,8 @@ public final class SceneEntityTeleportScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; clientPosVersion = 0; + retcode = 0; entityMotion.clear(); return this; } @@ -239,23 +239,23 @@ public final class SceneEntityTeleportScRspOuterClass { } SceneEntityTeleportScRsp other = (SceneEntityTeleportScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasRetcode() || retcode == other.retcode) && (!hasEntityMotion() || entityMotion.equals(other.entityMotion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(clientPosVersion); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); 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(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(entityMotion); @@ -282,25 +282,25 @@ public final class SceneEntityTeleportScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 56: { // clientPosVersion clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 112) { break; } } - case 74: { + case 112: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { // 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.retcode, retcode); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.entityMotion, entityMotion); @@ -345,10 +345,11 @@ public final class SceneEntityTeleportScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +357,10 @@ public final class SceneEntityTeleportScRspOuterClass { } break; } - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public final class SceneEntityTeleportScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName 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 168e37f..1c2538a 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 state = 1; + * optional uint32 state = 9; */ private int state; /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 12; */ private int groupId; /** - * optional .SceneGroupRefreshType group_refresh_type = 7; + * optional .SceneGroupRefreshType group_refresh_type = 14; */ private int groupRefreshType; /** - * repeated .SceneEntityRefreshInfo refresh_entity = 5; + * repeated .SceneEntityRefreshInfo refresh_entity = 7; */ private final RepeatedMessage refreshEntity = RepeatedMessage.newEmptyInstance(SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo.getFactory()); @@ -50,7 +50,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 9; * @return whether the state field is set */ public boolean hasState() { @@ -58,7 +58,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 9; * @return this */ public SceneGroupRefreshInfo clearState() { @@ -68,7 +68,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 9; * @return the state */ public int getState() { @@ -76,7 +76,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 9; * @param value the state to set * @return this */ @@ -87,7 +87,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 12; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -95,7 +95,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 12; * @return this */ public SceneGroupRefreshInfo clearGroupId() { @@ -105,7 +105,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 12; * @return the groupId */ public int getGroupId() { @@ -113,7 +113,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 12; * @param value the groupId to set * @return this */ @@ -124,7 +124,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 7; + * optional .SceneGroupRefreshType group_refresh_type = 14; * @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 = 14; * @return this */ public SceneGroupRefreshInfo clearGroupRefreshType() { @@ -142,7 +142,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 7; + * optional .SceneGroupRefreshType group_refresh_type = 14; * @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 = 14; * @param value the groupRefreshType to set * @return this */ @@ -187,7 +187,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 5; + * repeated .SceneEntityRefreshInfo refresh_entity = 7; * @return whether the refreshEntity field is set */ public boolean hasRefreshEntity() { @@ -195,7 +195,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 5; + * repeated .SceneEntityRefreshInfo refresh_entity = 7; * @return this */ public SceneGroupRefreshInfo clearRefreshEntity() { @@ -205,7 +205,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 5; + * repeated .SceneEntityRefreshInfo refresh_entity = 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. @@ -220,7 +220,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 5; + * repeated .SceneEntityRefreshInfo refresh_entity = 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 @@ -235,7 +235,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 5; + * repeated .SceneEntityRefreshInfo refresh_entity = 7; * @param value the refreshEntity to add * @return this */ @@ -247,7 +247,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 5; + * repeated .SceneEntityRefreshInfo refresh_entity = 7; * @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) 72); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 112); output.writeEnumNoTag(groupRefreshType); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < refreshEntity.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 58); output.writeMessageNoTag(refreshEntity.get(i)); } } @@ -380,25 +380,25 @@ public final class SceneGroupRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 72: { // state state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 96) { break; } } - case 16: { + case 96: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 112) { break; } } - case 56: { + case 112: { // 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 != 42) { + if (tag != 58) { break; } } - case 42: { + case 58: { // 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 a4ce3bb..6455e88 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 = 2; + * repeated .SceneGroupRefreshInfo group_refresh_info = 12; */ private final RepeatedMessage groupRefreshInfo = RepeatedMessage.newEmptyInstance(SceneGroupRefreshInfoOuterClass.SceneGroupRefreshInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 2; + * repeated .SceneGroupRefreshInfo group_refresh_info = 12; * @return whether the groupRefreshInfo field is set */ public boolean hasGroupRefreshInfo() { @@ -43,7 +43,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 2; + * repeated .SceneGroupRefreshInfo group_refresh_info = 12; * @return this */ public SceneGroupRefreshScNotify clearGroupRefreshInfo() { @@ -53,7 +53,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 2; + * repeated .SceneGroupRefreshInfo group_refresh_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. @@ -68,7 +68,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 2; + * repeated .SceneGroupRefreshInfo group_refresh_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 @@ -83,7 +83,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 2; + * repeated .SceneGroupRefreshInfo group_refresh_info = 12; * @param value the groupRefreshInfo to add * @return this */ @@ -95,7 +95,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 2; + * repeated .SceneGroupRefreshInfo group_refresh_info = 12; * @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) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(groupRefreshInfo.get(i)); } } @@ -189,7 +189,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 98: { // groupRefreshInfo tag = input.readRepeatedMessage(groupRefreshInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshTypeOuterClass.java index 5c281e2..d0500bf 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshTypeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshTypeOuterClass.java @@ -67,7 +67,7 @@ public final class SceneGroupRefreshTypeOuterClass { /** * @return a converter that maps between this enum's numeric and text representations */ - public static EnumConverter converter() { + public static ProtoEnum.EnumConverter converter() { return SceneGroupRefreshTypeConverter.INSTANCE; } @@ -89,7 +89,7 @@ public final class SceneGroupRefreshTypeOuterClass { return value == null ? other : value; } - enum SceneGroupRefreshTypeConverter implements EnumConverter { + enum SceneGroupRefreshTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; private static final SceneGroupRefreshType[] lookup = new SceneGroupRefreshType[3]; diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java index 107e2aa..468f6a3 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java @@ -19,17 +19,17 @@ public final class SceneGroupStateOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 state = 6; + * optional uint32 state = 2; */ private int state; /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 10; */ private int groupId; /** - * optional bool is_default = 2; + * optional bool is_default = 5; */ private boolean isDefault; @@ -44,7 +44,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 2; * @return whether the state field is set */ public boolean hasState() { @@ -52,7 +52,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 2; * @return this */ public SceneGroupState clearState() { @@ -62,7 +62,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 2; * @return the state */ public int getState() { @@ -70,7 +70,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 2; * @param value the state to set * @return this */ @@ -81,7 +81,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 10; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -89,7 +89,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 10; * @return this */ public SceneGroupState clearGroupId() { @@ -99,7 +99,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 10; * @return the groupId */ public int getGroupId() { @@ -107,7 +107,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 10; * @param value the groupId to set * @return this */ @@ -118,7 +118,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 2; + * optional bool is_default = 5; * @return whether the isDefault field is set */ public boolean hasIsDefault() { @@ -126,7 +126,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 2; + * optional bool is_default = 5; * @return this */ public SceneGroupState clearIsDefault() { @@ -136,7 +136,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 2; + * optional bool is_default = 5; * @return the isDefault */ public boolean getIsDefault() { @@ -144,7 +144,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 2; + * optional bool is_default = 5; * @param value the isDefault to set * @return this */ @@ -225,15 +225,15 @@ public final class SceneGroupStateOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isDefault); } } @@ -260,25 +260,25 @@ public final class SceneGroupStateOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 16: { // state state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { + case 80: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16) { + if (tag != 40) { break; } } - case 16: { + case 40: { // isDefault isDefault = input.readBool(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java index 97fc7ff..700a2ae 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java @@ -22,48 +22,45 @@ public final class SceneInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 2; */ private int planeId; /** - * optional uint32 entry_id = 6; - */ - private int entryId; - - /** - * optional uint32 floor_id = 7; - */ - private int floorId; - - /** - * optional uint32 game_mode_type = 10; + * optional uint32 game_mode_type = 5; */ private int gameModeType; /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; */ private int clientPosVersion; /** - * 
-     *  Guessed
-     *
- * + * optional uint32 floor_id = 11; + */ + private int floorId; + + /** + * optional uint32 entry_id = 13; + */ + private int entryId; + + /** * optional uint32 leader_entity_id = 14; */ private int leaderEntityId; /** - * 
-     *  Guessed
-     *
- * * optional uint32 world_id = 15; */ private int worldId; + /** + * optional uint32 content_id = 599; + */ + private int contentId; + /** * repeated uint32 group_id_list = 1; */ @@ -75,25 +72,25 @@ public final class SceneInfoOuterClass { private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .SceneEntityInfo entity_list = 4; + * repeated .SceneEntityInfo entity_list = 6; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); /** - * repeated .SceneEntityGroupInfo entity_group_list = 203; - */ - private final RepeatedMessage entityGroupList = RepeatedMessage.newEmptyInstance(SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo.getFactory()); - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 317; + * repeated .SceneInfo.ExtraDataEntry extra_data = 1458; */ private final RepeatedMessage extraData = RepeatedMessage.newEmptyInstance(ExtraDataEntry.getFactory()); /** - * repeated .SceneGroupState group_state_list = 1274; + * repeated .SceneGroupState group_state_list = 1577; */ private final RepeatedMessage groupStateList = RepeatedMessage.newEmptyInstance(SceneGroupStateOuterClass.SceneGroupState.getFactory()); + /** + * repeated .SceneEntityGroupInfo entity_group_list = 1909; + */ + private final RepeatedMessage entityGroupList = RepeatedMessage.newEmptyInstance(SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo.getFactory()); + private SceneInfo() { } @@ -105,7 +102,7 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 2; * @return whether the planeId field is set */ public boolean hasPlaneId() { @@ -113,7 +110,7 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 2; * @return this */ public SceneInfo clearPlaneId() { @@ -123,7 +120,7 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 2; * @return the planeId */ public int getPlaneId() { @@ -131,7 +128,7 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 plane_id = 5; + * optional uint32 plane_id = 2; * @param value the planeId to set * @return this */ @@ -142,99 +139,25 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 entry_id = 6; - * @return whether the entryId field is set + * optional uint32 game_mode_type = 5; + * @return whether the gameModeType field is set */ - public boolean hasEntryId() { + public boolean hasGameModeType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entry_id = 6; - * @return this - */ - public SceneInfo 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 SceneInfo setEntryId(final int value) { - bitField0_ |= 0x00000002; - entryId = value; - return this; - } - - /** - * optional uint32 floor_id = 7; - * @return whether the floorId field is set - */ - public boolean hasFloorId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 floor_id = 7; - * @return this - */ - public SceneInfo clearFloorId() { - bitField0_ &= ~0x00000004; - floorId = 0; - return this; - } - - /** - * optional uint32 floor_id = 7; - * @return the floorId - */ - public int getFloorId() { - return floorId; - } - - /** - * optional uint32 floor_id = 7; - * @param value the floorId to set - * @return this - */ - public SceneInfo setFloorId(final int value) { - bitField0_ |= 0x00000004; - floorId = value; - return this; - } - - /** - * optional uint32 game_mode_type = 10; - * @return whether the gameModeType field is set - */ - public boolean hasGameModeType() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 game_mode_type = 10; + * optional uint32 game_mode_type = 5; * @return this */ public SceneInfo clearGameModeType() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; gameModeType = 0; return this; } /** - * optional uint32 game_mode_type = 10; + * optional uint32 game_mode_type = 5; * @return the gameModeType */ public int getGameModeType() { @@ -242,36 +165,36 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 game_mode_type = 10; + * optional uint32 game_mode_type = 5; * @param value the gameModeType to set * @return this */ public SceneInfo setGameModeType(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; gameModeType = value; return this; } /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; * @return whether the clientPosVersion field is set */ public boolean hasClientPosVersion() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; * @return this */ public SceneInfo clearClientPosVersion() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; clientPosVersion = 0; return this; } /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -279,21 +202,91 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 client_pos_version = 12; + * optional uint32 client_pos_version = 7; * @param value the clientPosVersion to set * @return this */ public SceneInfo setClientPosVersion(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; clientPosVersion = value; return this; } /** - * 
-     *  Guessed
-     *
- * + * optional uint32 floor_id = 11; + * @return whether the floorId field is set + */ + public boolean hasFloorId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 floor_id = 11; + * @return this + */ + public SceneInfo clearFloorId() { + bitField0_ &= ~0x00000008; + floorId = 0; + return this; + } + + /** + * optional uint32 floor_id = 11; + * @return the floorId + */ + public int getFloorId() { + return floorId; + } + + /** + * optional uint32 floor_id = 11; + * @param value the floorId to set + * @return this + */ + public SceneInfo setFloorId(final int value) { + bitField0_ |= 0x00000008; + floorId = value; + return this; + } + + /** + * optional uint32 entry_id = 13; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 entry_id = 13; + * @return this + */ + public SceneInfo clearEntryId() { + bitField0_ &= ~0x00000010; + 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 SceneInfo setEntryId(final int value) { + bitField0_ |= 0x00000010; + entryId = value; + return this; + } + + /** * optional uint32 leader_entity_id = 14; * @return whether the leaderEntityId field is set */ @@ -302,10 +295,6 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * * optional uint32 leader_entity_id = 14; * @return this */ @@ -316,10 +305,6 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * * optional uint32 leader_entity_id = 14; * @return the leaderEntityId */ @@ -328,10 +313,6 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * * optional uint32 leader_entity_id = 14; * @param value the leaderEntityId to set * @return this @@ -343,10 +324,6 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * * optional uint32 world_id = 15; * @return whether the worldId field is set */ @@ -355,10 +332,6 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * * optional uint32 world_id = 15; * @return this */ @@ -369,10 +342,6 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * * optional uint32 world_id = 15; * @return the worldId */ @@ -381,10 +350,6 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * * optional uint32 world_id = 15; * @param value the worldId to set * @return this @@ -395,12 +360,49 @@ public final class SceneInfoOuterClass { return this; } + /** + * optional uint32 content_id = 599; + * @return whether the contentId field is set + */ + public boolean hasContentId() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional uint32 content_id = 599; + * @return this + */ + public SceneInfo clearContentId() { + bitField0_ &= ~0x00000080; + contentId = 0; + return this; + } + + /** + * optional uint32 content_id = 599; + * @return the contentId + */ + public int getContentId() { + return contentId; + } + + /** + * optional uint32 content_id = 599; + * @param value the contentId to set + * @return this + */ + public SceneInfo setContentId(final int value) { + bitField0_ |= 0x00000080; + contentId = value; + return this; + } + /** * repeated uint32 group_id_list = 1; * @return whether the groupIdList field is set */ public boolean hasGroupIdList() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000100) != 0; } /** @@ -408,7 +410,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearGroupIdList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000100; groupIdList.clear(); return this; } @@ -437,7 +439,7 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableGroupIdList() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return groupIdList; } @@ -447,7 +449,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addGroupIdList(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; groupIdList.add(value); return this; } @@ -458,7 +460,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addAllGroupIdList(final int... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; groupIdList.addAll(values); return this; } @@ -468,7 +470,7 @@ public final class SceneInfoOuterClass { * @return whether the lightenSectionList field is set */ public boolean hasLightenSectionList() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000200) != 0; } /** @@ -476,7 +478,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearLightenSectionList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000200; lightenSectionList.clear(); return this; } @@ -505,7 +507,7 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableLightenSectionList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return lightenSectionList; } @@ -515,7 +517,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addLightenSectionList(final int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; lightenSectionList.add(value); return this; } @@ -526,31 +528,31 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addAllLightenSectionList(final int... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; lightenSectionList.addAll(values); return this; } /** - * repeated .SceneEntityInfo entity_list = 4; + * repeated .SceneEntityInfo entity_list = 6; * @return whether the entityList field is set */ public boolean hasEntityList() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000400) != 0; } /** - * repeated .SceneEntityInfo entity_list = 4; + * repeated .SceneEntityInfo entity_list = 6; * @return this */ public SceneInfo clearEntityList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000400; entityList.clear(); return this; } /** - * repeated .SceneEntityInfo entity_list = 4; + * repeated .SceneEntityInfo entity_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. @@ -564,7 +566,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 4; + * repeated .SceneEntityInfo entity_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 @@ -573,52 +575,189 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEntityList() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; return entityList; } /** - * repeated .SceneEntityInfo entity_list = 4; + * repeated .SceneEntityInfo entity_list = 6; * @param value the entityList to add * @return this */ public SceneInfo addEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; entityList.add(value); return this; } /** - * repeated .SceneEntityInfo entity_list = 4; + * repeated .SceneEntityInfo entity_list = 6; * @param values the entityList to add * @return this */ public SceneInfo addAllEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; entityList.addAll(values); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 203; - * @return whether the entityGroupList field is set + * repeated .SceneInfo.ExtraDataEntry extra_data = 1458; + * @return whether the extraData field is set */ - public boolean hasEntityGroupList() { - return (bitField0_ & 0x00000400) != 0; + public boolean hasExtraData() { + return (bitField0_ & 0x00000800) != 0; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 203; + * repeated .SceneInfo.ExtraDataEntry extra_data = 1458; + * @return this + */ + public SceneInfo clearExtraData() { + bitField0_ &= ~0x00000800; + extraData.clear(); + return this; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 1458; + * + * This method returns 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 = 1458; + * + * 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 = 1458; + * @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 = 1458; + * @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 = 1577; + * @return whether the groupStateList field is set + */ + public boolean hasGroupStateList() { + return (bitField0_ & 0x00001000) != 0; + } + + /** + * repeated .SceneGroupState group_state_list = 1577; + * @return this + */ + public SceneInfo clearGroupStateList() { + bitField0_ &= ~0x00001000; + groupStateList.clear(); + return this; + } + + /** + * repeated .SceneGroupState group_state_list = 1577; + * + * This method returns 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 = 1577; + * + * 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 = 1577; + * @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 = 1577; + * @param values the groupStateList to add + * @return this + */ + public SceneInfo addAllGroupStateList( + final SceneGroupStateOuterClass.SceneGroupState... values) { + bitField0_ |= 0x00001000; + groupStateList.addAll(values); + return this; + } + + /** + * repeated .SceneEntityGroupInfo entity_group_list = 1909; + * @return whether the entityGroupList field is set + */ + public boolean hasEntityGroupList() { + return (bitField0_ & 0x00002000) != 0; + } + + /** + * repeated .SceneEntityGroupInfo entity_group_list = 1909; * @return this */ public SceneInfo clearEntityGroupList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00002000; entityGroupList.clear(); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 203; + * repeated .SceneEntityGroupInfo entity_group_list = 1909; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -633,7 +772,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityGroupInfo entity_group_list = 203; + * repeated .SceneEntityGroupInfo entity_group_list = 1909; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -643,189 +782,53 @@ public final class SceneInfoOuterClass { */ public RepeatedMessage getMutableEntityGroupList( ) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00002000; return entityGroupList; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 203; + * repeated .SceneEntityGroupInfo entity_group_list = 1909; * @param value the entityGroupList to add * @return this */ public SceneInfo addEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00002000; entityGroupList.add(value); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 203; + * repeated .SceneEntityGroupInfo entity_group_list = 1909; * @param values the entityGroupList to add * @return this */ public SceneInfo addAllEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00002000; entityGroupList.addAll(values); return this; } - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 317; - * @return whether the extraData field is set - */ - public boolean hasExtraData() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 317; - * @return this - */ - public SceneInfo clearExtraData() { - bitField0_ &= ~0x00000800; - extraData.clear(); - return this; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 317; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableExtraData()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getExtraData() { - return extraData; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 317; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableExtraData() { - bitField0_ |= 0x00000800; - return extraData; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 317; - * @param value the extraData to add - * @return this - */ - public SceneInfo addExtraData(final ExtraDataEntry value) { - bitField0_ |= 0x00000800; - extraData.add(value); - return this; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 317; - * @param values the extraData to add - * @return this - */ - public SceneInfo addAllExtraData(final ExtraDataEntry... values) { - bitField0_ |= 0x00000800; - extraData.addAll(values); - return this; - } - - /** - * repeated .SceneGroupState group_state_list = 1274; - * @return whether the groupStateList field is set - */ - public boolean hasGroupStateList() { - return (bitField0_ & 0x00001000) != 0; - } - - /** - * repeated .SceneGroupState group_state_list = 1274; - * @return this - */ - public SceneInfo clearGroupStateList() { - bitField0_ &= ~0x00001000; - groupStateList.clear(); - return this; - } - - /** - * repeated .SceneGroupState group_state_list = 1274; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableGroupStateList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getGroupStateList() { - return groupStateList; - } - - /** - * repeated .SceneGroupState group_state_list = 1274; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableGroupStateList() { - bitField0_ |= 0x00001000; - return groupStateList; - } - - /** - * repeated .SceneGroupState group_state_list = 1274; - * @param value the groupStateList to add - * @return this - */ - public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupState value) { - bitField0_ |= 0x00001000; - groupStateList.add(value); - return this; - } - - /** - * repeated .SceneGroupState group_state_list = 1274; - * @param values the groupStateList to add - * @return this - */ - public SceneInfo addAllGroupStateList( - final SceneGroupStateOuterClass.SceneGroupState... values) { - bitField0_ |= 0x00001000; - groupStateList.addAll(values); - return this; - } - @Override public SceneInfo copyFrom(final SceneInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; planeId = other.planeId; - entryId = other.entryId; - floorId = other.floorId; gameModeType = other.gameModeType; clientPosVersion = other.clientPosVersion; + floorId = other.floorId; + entryId = other.entryId; leaderEntityId = other.leaderEntityId; worldId = other.worldId; + contentId = other.contentId; groupIdList.copyFrom(other.groupIdList); lightenSectionList.copyFrom(other.lightenSectionList); entityList.copyFrom(other.entityList); - entityGroupList.copyFrom(other.entityGroupList); extraData.copyFrom(other.extraData); groupStateList.copyFrom(other.groupStateList); + entityGroupList.copyFrom(other.entityGroupList); } return this; } @@ -839,24 +842,27 @@ public final class SceneInfoOuterClass { if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasEntryId()) { - setEntryId(other.entryId); - } - if (other.hasFloorId()) { - setFloorId(other.floorId); - } if (other.hasGameModeType()) { setGameModeType(other.gameModeType); } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } + if (other.hasFloorId()) { + setFloorId(other.floorId); + } + if (other.hasEntryId()) { + setEntryId(other.entryId); + } if (other.hasLeaderEntityId()) { setLeaderEntityId(other.leaderEntityId); } if (other.hasWorldId()) { setWorldId(other.worldId); } + if (other.hasContentId()) { + setContentId(other.contentId); + } if (other.hasGroupIdList()) { getMutableGroupIdList().addAll(other.groupIdList); } @@ -866,15 +872,15 @@ public final class SceneInfoOuterClass { 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; } @@ -886,18 +892,19 @@ public final class SceneInfoOuterClass { cachedSize = -1; bitField0_ = 0; planeId = 0; - entryId = 0; - floorId = 0; gameModeType = 0; clientPosVersion = 0; + floorId = 0; + entryId = 0; leaderEntityId = 0; worldId = 0; + contentId = 0; groupIdList.clear(); lightenSectionList.clear(); entityList.clear(); - entityGroupList.clear(); extraData.clear(); groupStateList.clear(); + entityGroupList.clear(); return this; } @@ -911,9 +918,9 @@ public final class SceneInfoOuterClass { groupIdList.clear(); lightenSectionList.clear(); entityList.clearQuick(); - entityGroupList.clearQuick(); extraData.clearQuick(); groupStateList.clearQuick(); + entityGroupList.clearQuick(); return this; } @@ -928,41 +935,42 @@ public final class SceneInfoOuterClass { SceneInfo other = (SceneInfo) o; return bitField0_ == other.bitField0_ && (!hasPlaneId() || planeId == other.planeId) - && (!hasEntryId() || entryId == other.entryId) - && (!hasFloorId() || floorId == other.floorId) && (!hasGameModeType() || gameModeType == other.gameModeType) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasFloorId() || floorId == other.floorId) + && (!hasEntryId() || entryId == other.entryId) && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) && (!hasWorldId() || worldId == other.worldId) + && (!hasContentId() || contentId == other.contentId) && (!hasGroupIdList() || groupIdList.equals(other.groupIdList)) && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) && (!hasEntityList() || entityList.equals(other.entityList)) - && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)) && (!hasExtraData() || extraData.equals(other.extraData)) - && (!hasGroupStateList() || groupStateList.equals(other.groupStateList)); + && (!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) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(gameModeType); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(floorId); + output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(gameModeType); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(floorId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(clientPosVersion); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 112); @@ -973,41 +981,45 @@ public final class SceneInfoOuterClass { output.writeUInt32NoTag(worldId); } if ((bitField0_ & 0x00000080) != 0) { + output.writeRawLittleEndian16((short) 9656); + output.writeUInt32NoTag(contentId); + } + if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < groupIdList.length(); i++) { output.writeRawByte((byte) 8); output.writeUInt32NoTag(groupIdList.array()[i]); } } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < lightenSectionList.length(); i++) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(lightenSectionList.array()[i]); } } - if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(entityList.get(i)); - } - } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < entityGroupList.length(); i++) { - output.writeRawLittleEndian16((short) 3290); - output.writeMessageNoTag(entityGroupList.get(i)); + for (int i = 0; i < entityList.length(); i++) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(entityList.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < extraData.length(); i++) { - output.writeRawLittleEndian16((short) 5098); + output.writeRawLittleEndian16((short) 23442); output.writeMessageNoTag(extraData.get(i)); } } if ((bitField0_ & 0x00001000) != 0) { for (int i = 0; i < groupStateList.length(); i++) { - output.writeRawLittleEndian16((short) 20434); + output.writeRawLittleEndian16((short) 25290); output.writeMessageNoTag(groupStateList.get(i)); } } + if ((bitField0_ & 0x00002000) != 0) { + for (int i = 0; i < entityGroupList.length(); i++) { + output.writeRawLittleEndian16((short) 30634); + output.writeMessageNoTag(entityGroupList.get(i)); + } + } } @Override @@ -1017,17 +1029,17 @@ public final class SceneInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); } @@ -1035,16 +1047,16 @@ public final class SceneInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); + size += 2 + ProtoSink.computeUInt32SizeNoTag(contentId); } 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); + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000400) != 0) { - size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); + size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList); } if ((bitField0_ & 0x00000800) != 0) { size += (2 * extraData.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(extraData); @@ -1052,6 +1064,9 @@ public final class SceneInfoOuterClass { if ((bitField0_ & 0x00001000) != 0) { size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList); } + if ((bitField0_ & 0x00002000) != 0) { + size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); + } return size; } @@ -1062,18 +1077,18 @@ public final class SceneInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // planeId planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { - // entryId - entryId = input.readUInt32(); + case 40: { + // gameModeType + gameModeType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 56) { @@ -1081,26 +1096,26 @@ public final class SceneInfoOuterClass { } } case 56: { - // floorId - floorId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // gameModeType - gameModeType = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { // clientPosVersion clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // floorId + floorId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 112) { @@ -1121,6 +1136,15 @@ public final class SceneInfoOuterClass { worldId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); + if (tag != 4792) { + break; + } + } + case 4792: { + // contentId + contentId = input.readUInt32(); + bitField0_ |= 0x00000080; + tag = input.readTag(); if (tag != 10) { break; } @@ -1128,7 +1152,7 @@ public final class SceneInfoOuterClass { case 10: { // groupIdList [packed=true] input.readPackedUInt32(groupIdList, tag); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 66) { break; @@ -1137,40 +1161,40 @@ public final class SceneInfoOuterClass { case 66: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 34) { + if (tag != 50) { break; } } - case 34: { + case 50: { // entityList tag = input.readRepeatedMessage(entityList, tag); - bitField0_ |= 0x00000200; - if (tag != 1626) { - break; - } - } - case 1626: { - // entityGroupList - tag = input.readRepeatedMessage(entityGroupList, tag); bitField0_ |= 0x00000400; - if (tag != 2538) { + if (tag != 11666) { break; } } - case 2538: { + case 11666: { // extraData tag = input.readRepeatedMessage(extraData, tag); bitField0_ |= 0x00000800; - if (tag != 10194) { + if (tag != 12618) { break; } } - case 10194: { + case 12618: { // groupStateList tag = input.readRepeatedMessage(groupStateList, tag); bitField0_ |= 0x00001000; + if (tag != 15274) { + break; + } + } + case 15274: { + // entityGroupList + tag = input.readRepeatedMessage(entityGroupList, tag); + bitField0_ |= 0x00002000; if (tag != 0) { break; } @@ -1188,13 +1212,13 @@ public final class SceneInfoOuterClass { case 8: { // groupIdList [packed=false] tag = input.readRepeatedUInt32(groupIdList, tag); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; break; } case 64: { // lightenSectionList [packed=false] tag = input.readRepeatedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; break; } } @@ -1208,17 +1232,17 @@ public final class SceneInfoOuterClass { output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.floorId, floorId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.gameModeType, gameModeType); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.floorId, floorId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); + } if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); } @@ -1226,16 +1250,16 @@ public final class SceneInfoOuterClass { output.writeUInt32(FieldNames.worldId, worldId); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); + output.writeUInt32(FieldNames.contentId, contentId); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); + output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedMessage(FieldNames.entityList, entityList); + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); + output.writeRepeatedMessage(FieldNames.entityList, entityList); } if ((bitField0_ & 0x00000800) != 0) { output.writeRepeatedMessage(FieldNames.extraData, extraData); @@ -1243,6 +1267,9 @@ public final class SceneInfoOuterClass { if ((bitField0_ & 0x00001000) != 0) { output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList); } + if ((bitField0_ & 0x00002000) != 0) { + output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); + } output.endObject(); } @@ -1265,36 +1292,12 @@ public final class SceneInfoOuterClass { } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { - if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -766027193: - case 2022982190: { - if (input.isAtField(FieldNames.floorId)) { - if (!input.trySkipNullValue()) { - floorId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -464498289: case 1937775689: { if (input.isAtField(FieldNames.gameModeType)) { if (!input.trySkipNullValue()) { gameModeType = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -1306,6 +1309,30 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { clientPosVersion = 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 -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { + if (!input.trySkipNullValue()) { + entryId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1337,12 +1364,24 @@ public final class SceneInfoOuterClass { } break; } + case -407108748: + case 264552097: { + if (input.isAtField(FieldNames.contentId)) { + if (!input.trySkipNullValue()) { + contentId = input.readUInt32(); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } case 457110456: case 1703805826: { if (input.isAtField(FieldNames.groupIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(groupIdList); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1354,7 +1393,7 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.lightenSectionList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(lightenSectionList); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -1366,18 +1405,6 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.entityList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityList); - bitField0_ |= 0x00000200; - } - } else { - input.skipUnknownField(); - } - break; - } - case -914706662: - case 1589108794: { - if (input.isAtField(FieldNames.entityGroupList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(entityGroupList); bitField0_ |= 0x00000400; } } else { @@ -1409,6 +1436,18 @@ public final class SceneInfoOuterClass { } break; } + case -914706662: + case 1589108794: { + if (input.isAtField(FieldNames.entityGroupList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(entityGroupList); + bitField0_ |= 0x00002000; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -1817,29 +1856,31 @@ public final class SceneInfoOuterClass { static class FieldNames { static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - - static final FieldName floorId = FieldName.forField("floorId", "floor_id"); - static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type"); static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName floorId = FieldName.forField("floorId", "floor_id"); + + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); static final FieldName worldId = FieldName.forField("worldId", "world_id"); + static final FieldName contentId = FieldName.forField("contentId", "content_id"); + static final FieldName groupIdList = FieldName.forField("groupIdList", "group_id_list"); static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); static final FieldName entityList = FieldName.forField("entityList", "entity_list"); - static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list"); - static final FieldName extraData = FieldName.forField("extraData", "extra_data"); static final FieldName groupStateList = FieldName.forField("groupStateList", "group_state_list"); + + static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java index 6bfe25f..b1e5cb9 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java @@ -19,19 +19,19 @@ public final class SceneMonsterOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 monster_id = 10; + * optional uint32 cur_hp = 2; */ - private int monsterId; + private int curHp; /** - * optional uint32 max_hp = 14; + * optional uint32 max_hp = 7; */ private int maxHp; /** - * optional uint32 cur_hp = 15; + * optional uint32 monster_id = 15; */ - private int curHp; + private int monsterId; private SceneMonster() { } @@ -44,44 +44,44 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 monster_id = 10; - * @return whether the monsterId field is set + * optional uint32 cur_hp = 2; + * @return whether the curHp field is set */ - public boolean hasMonsterId() { + public boolean hasCurHp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 monster_id = 10; + * optional uint32 cur_hp = 2; * @return this */ - public SceneMonster clearMonsterId() { + public SceneMonster clearCurHp() { bitField0_ &= ~0x00000001; - monsterId = 0; + curHp = 0; return this; } /** - * optional uint32 monster_id = 10; - * @return the monsterId + * optional uint32 cur_hp = 2; + * @return the curHp */ - public int getMonsterId() { - return monsterId; + public int getCurHp() { + return curHp; } /** - * optional uint32 monster_id = 10; - * @param value the monsterId to set + * optional uint32 cur_hp = 2; + * @param value the curHp to set * @return this */ - public SceneMonster setMonsterId(final int value) { + public SceneMonster setCurHp(final int value) { bitField0_ |= 0x00000001; - monsterId = value; + curHp = value; return this; } /** - * optional uint32 max_hp = 14; + * optional uint32 max_hp = 7; * @return whether the maxHp field is set */ public boolean hasMaxHp() { @@ -89,7 +89,7 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 max_hp = 14; + * optional uint32 max_hp = 7; * @return this */ public SceneMonster clearMaxHp() { @@ -99,7 +99,7 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 max_hp = 14; + * optional uint32 max_hp = 7; * @return the maxHp */ public int getMaxHp() { @@ -107,7 +107,7 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 max_hp = 14; + * optional uint32 max_hp = 7; * @param value the maxHp to set * @return this */ @@ -118,39 +118,39 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 cur_hp = 15; - * @return whether the curHp field is set + * optional uint32 monster_id = 15; + * @return whether the monsterId field is set */ - public boolean hasCurHp() { + public boolean hasMonsterId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 cur_hp = 15; + * optional uint32 monster_id = 15; * @return this */ - public SceneMonster clearCurHp() { + public SceneMonster clearMonsterId() { bitField0_ &= ~0x00000004; - curHp = 0; + monsterId = 0; return this; } /** - * optional uint32 cur_hp = 15; - * @return the curHp + * optional uint32 monster_id = 15; + * @return the monsterId */ - public int getCurHp() { - return curHp; + public int getMonsterId() { + return monsterId; } /** - * optional uint32 cur_hp = 15; - * @param value the curHp to set + * optional uint32 monster_id = 15; + * @param value the monsterId to set * @return this */ - public SceneMonster setCurHp(final int value) { + public SceneMonster setMonsterId(final int value) { bitField0_ |= 0x00000004; - curHp = value; + monsterId = value; return this; } @@ -159,9 +159,9 @@ public final class SceneMonsterOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - monsterId = other.monsterId; - maxHp = other.maxHp; curHp = other.curHp; + maxHp = other.maxHp; + monsterId = other.monsterId; } return this; } @@ -172,14 +172,14 @@ public final class SceneMonsterOuterClass { return this; } cachedSize = -1; - if (other.hasMonsterId()) { - setMonsterId(other.monsterId); + if (other.hasCurHp()) { + setCurHp(other.curHp); } if (other.hasMaxHp()) { setMaxHp(other.maxHp); } - if (other.hasCurHp()) { - setCurHp(other.curHp); + if (other.hasMonsterId()) { + setMonsterId(other.monsterId); } return this; } @@ -191,9 +191,9 @@ public final class SceneMonsterOuterClass { } cachedSize = -1; bitField0_ = 0; - monsterId = 0; - maxHp = 0; curHp = 0; + maxHp = 0; + monsterId = 0; return this; } @@ -217,24 +217,24 @@ public final class SceneMonsterOuterClass { } SceneMonster other = (SceneMonster) o; return bitField0_ == other.bitField0_ - && (!hasMonsterId() || monsterId == other.monsterId) + && (!hasCurHp() || curHp == other.curHp) && (!hasMaxHp() || maxHp == other.maxHp) - && (!hasCurHp() || curHp == other.curHp); + && (!hasMonsterId() || monsterId == other.monsterId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(monsterId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(curHp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(maxHp); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(curHp); + output.writeUInt32NoTag(monsterId); } } @@ -242,13 +242,13 @@ public final class SceneMonsterOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } return size; } @@ -260,16 +260,16 @@ public final class SceneMonsterOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // monsterId - monsterId = input.readUInt32(); + case 16: { + // curHp + curHp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 56) { break; } } - case 112: { + case 56: { // maxHp maxHp = input.readUInt32(); bitField0_ |= 0x00000002; @@ -279,8 +279,8 @@ public final class SceneMonsterOuterClass { } } case 120: { - // curHp - curHp = input.readUInt32(); + // monsterId + monsterId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class SceneMonsterOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.monsterId, monsterId); + output.writeUInt32(FieldNames.curHp, curHp); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.maxHp, maxHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curHp, curHp); + output.writeUInt32(FieldNames.monsterId, monsterId); } output.endObject(); } @@ -323,11 +323,11 @@ public final class SceneMonsterOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1316830571: - case 2127946656: { - if (input.isAtField(FieldNames.monsterId)) { + case 95026024: + case -1349138585: { + if (input.isAtField(FieldNames.curHp)) { if (!input.trySkipNullValue()) { - monsterId = input.readUInt32(); + curHp = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -347,11 +347,11 @@ public final class SceneMonsterOuterClass { } break; } - case 95026024: - case -1349138585: { - if (input.isAtField(FieldNames.curHp)) { + case -1316830571: + case 2127946656: { + if (input.isAtField(FieldNames.monsterId)) { if (!input.trySkipNullValue()) { - curHp = input.readUInt32(); + monsterId = 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 monsterId = FieldName.forField("monsterId", "monster_id"); + static final FieldName curHp = FieldName.forField("curHp", "cur_hp"); static final FieldName maxHp = FieldName.forField("maxHp", "max_hp"); - static final FieldName curHp = FieldName.forField("curHp", "cur_hp"); + static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java index f62726f..85bd1cb 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 stage_id = 8; - */ - private int stageId; - - /** - * optional uint32 wave_id = 9; + * optional uint32 wave_id = 10; */ private int waveId; /** - * optional .SceneMonsterWaveParam wave_param = 6; + * optional uint32 stage_id = 14; + */ + private int stageId; + + /** + * optional .SceneMonsterWaveParam wave_param = 13; */ private final SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam waveParam = SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam.newInstance(); /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 3; */ private final RepeatedMessage dropList = RepeatedMessage.newEmptyInstance(ItemListOuterClass.ItemList.getFactory()); /** - * repeated .SceneMonster monster_list = 12; + * repeated .SceneMonster monster_list = 4; */ private final RepeatedMessage monsterList = RepeatedMessage.newEmptyInstance(SceneMonsterOuterClass.SceneMonster.getFactory()); @@ -55,62 +55,25 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 stage_id = 8; - * @return whether the stageId field is set + * optional uint32 wave_id = 10; + * @return whether the waveId field is set */ - public boolean hasStageId() { + public boolean hasWaveId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stage_id = 8; - * @return this - */ - public SceneMonsterWave 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 SceneMonsterWave setStageId(final int value) { - bitField0_ |= 0x00000001; - stageId = value; - return this; - } - - /** - * optional uint32 wave_id = 9; - * @return whether the waveId field is set - */ - public boolean hasWaveId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 wave_id = 9; + * optional uint32 wave_id = 10; * @return this */ public SceneMonsterWave clearWaveId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; waveId = 0; return this; } /** - * optional uint32 wave_id = 9; + * optional uint32 wave_id = 10; * @return the waveId */ public int getWaveId() { @@ -118,18 +81,55 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 wave_id = 9; + * optional uint32 wave_id = 10; * @param value the waveId to set * @return this */ public SceneMonsterWave setWaveId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; waveId = value; return this; } /** - * optional .SceneMonsterWaveParam wave_param = 6; + * optional uint32 stage_id = 14; + * @return whether the stageId field is set + */ + public boolean hasStageId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 stage_id = 14; + * @return this + */ + public SceneMonsterWave clearStageId() { + bitField0_ &= ~0x00000002; + stageId = 0; + return this; + } + + /** + * optional uint32 stage_id = 14; + * @return the stageId + */ + public int getStageId() { + return stageId; + } + + /** + * optional uint32 stage_id = 14; + * @param value the stageId to set + * @return this + */ + public SceneMonsterWave setStageId(final int value) { + bitField0_ |= 0x00000002; + stageId = value; + return this; + } + + /** + * optional .SceneMonsterWaveParam wave_param = 13; * @return whether the waveParam field is set */ public boolean hasWaveParam() { @@ -137,7 +137,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 6; + * optional .SceneMonsterWaveParam wave_param = 13; * @return this */ public SceneMonsterWave clearWaveParam() { @@ -147,7 +147,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 6; + * optional .SceneMonsterWaveParam wave_param = 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. @@ -161,7 +161,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 6; + * optional .SceneMonsterWaveParam wave_param = 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 @@ -175,7 +175,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 6; + * optional .SceneMonsterWaveParam wave_param = 13; * @param value the waveParam to set * @return this */ @@ -187,7 +187,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 3; * @return whether the dropList field is set */ public boolean hasDropList() { @@ -195,7 +195,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 3; * @return this */ public SceneMonsterWave clearDropList() { @@ -205,7 +205,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_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 .ItemList drop_list = 5; + * repeated .ItemList drop_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 .ItemList drop_list = 5; + * repeated .ItemList drop_list = 3; * @param value the dropList to add * @return this */ @@ -244,7 +244,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 3; * @param values the dropList to add * @return this */ @@ -255,7 +255,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 12; + * repeated .SceneMonster monster_list = 4; * @return whether the monsterList field is set */ public boolean hasMonsterList() { @@ -263,7 +263,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 12; + * repeated .SceneMonster monster_list = 4; * @return this */ public SceneMonsterWave clearMonsterList() { @@ -273,7 +273,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 12; + * repeated .SceneMonster monster_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 .SceneMonster monster_list = 12; + * repeated .SceneMonster monster_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 .SceneMonster monster_list = 12; + * repeated .SceneMonster monster_list = 4; * @param value the monsterList to add * @return this */ @@ -312,7 +312,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 12; + * repeated .SceneMonster monster_list = 4; * @param values the monsterList to add * @return this */ @@ -327,8 +327,8 @@ public final class SceneMonsterWaveOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - stageId = other.stageId; waveId = other.waveId; + stageId = other.stageId; waveParam.copyFrom(other.waveParam); dropList.copyFrom(other.dropList); monsterList.copyFrom(other.monsterList); @@ -342,12 +342,12 @@ public final class SceneMonsterWaveOuterClass { return this; } cachedSize = -1; - if (other.hasStageId()) { - setStageId(other.stageId); - } if (other.hasWaveId()) { setWaveId(other.waveId); } + if (other.hasStageId()) { + setStageId(other.stageId); + } if (other.hasWaveParam()) { getMutableWaveParam().mergeFrom(other.waveParam); } @@ -367,8 +367,8 @@ public final class SceneMonsterWaveOuterClass { } cachedSize = -1; bitField0_ = 0; - stageId = 0; waveId = 0; + stageId = 0; waveParam.clear(); dropList.clear(); monsterList.clear(); @@ -398,8 +398,8 @@ public final class SceneMonsterWaveOuterClass { } SceneMonsterWave other = (SceneMonsterWave) o; return bitField0_ == other.bitField0_ - && (!hasStageId() || stageId == other.stageId) && (!hasWaveId() || waveId == other.waveId) + && (!hasStageId() || stageId == other.stageId) && (!hasWaveParam() || waveParam.equals(other.waveParam)) && (!hasDropList() || dropList.equals(other.dropList)) && (!hasMonsterList() || monsterList.equals(other.monsterList)); @@ -408,26 +408,26 @@ public final class SceneMonsterWaveOuterClass { @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) 72); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(waveId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(stageId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 106); output.writeMessageNoTag(waveParam); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < dropList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 26); output.writeMessageNoTag(dropList.get(i)); } } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < monsterList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(monsterList.get(i)); } } @@ -437,10 +437,10 @@ public final class SceneMonsterWaveOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(waveParam); @@ -461,42 +461,42 @@ public final class SceneMonsterWaveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 80: { // waveId waveId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 112) { break; } } - case 50: { + case 112: { + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { // waveParam input.readMessage(waveParam); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 26) { break; } } - case 42: { + case 26: { // dropList tag = input.readRepeatedMessage(dropList, tag); bitField0_ |= 0x00000008; - if (tag != 98) { + if (tag != 34) { break; } } - case 98: { + case 34: { // monsterList tag = input.readRepeatedMessage(monsterList, 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.stageId, stageId); + output.writeUInt32(FieldNames.waveId, waveId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.waveId, waveId); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.waveParam, waveParam); @@ -546,11 +546,11 @@ public final class SceneMonsterWaveOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -558,11 +558,11 @@ public final class SceneMonsterWaveOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -659,10 +659,10 @@ public final class SceneMonsterWaveOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName waveId = FieldName.forField("waveId", "wave_id"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName waveParam = FieldName.forField("waveParam", "wave_param"); static final FieldName dropList = FieldName.forField("dropList", "drop_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java index 5872af8..ae5cfce 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 = 4; + * optional uint32 level = 5; */ private int level; @@ -34,7 +34,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 5; * @return whether the level field is set */ public boolean hasLevel() { @@ -42,7 +42,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 5; * @return this */ public SceneMonsterWaveParam clearLevel() { @@ -52,7 +52,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 5; * @return the level */ public int getLevel() { @@ -60,7 +60,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 4; + * optional uint32 level = 5; * @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) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(level); } } @@ -150,7 +150,7 @@ public final class SceneMonsterWaveParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // 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 ab6ef35..af82397 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java @@ -19,12 +19,12 @@ public final class SceneNpcInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 3; */ private int npcId; /** - * optional .NpcExtraInfo extra_info = 7; + * optional .NpcExtraInfo extra_info = 6; */ private final NpcExtraInfoOuterClass.NpcExtraInfo extraInfo = NpcExtraInfoOuterClass.NpcExtraInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 3; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -47,7 +47,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 3; * @return this */ public SceneNpcInfo clearNpcId() { @@ -57,7 +57,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 3; * @return the npcId */ public int getNpcId() { @@ -65,7 +65,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 3; * @param value the npcId to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 7; + * optional .NpcExtraInfo extra_info = 6; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -84,7 +84,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 7; + * optional .NpcExtraInfo extra_info = 6; * @return this */ public SceneNpcInfo clearExtraInfo() { @@ -94,7 +94,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 7; + * optional .NpcExtraInfo extra_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 SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 7; + * optional .NpcExtraInfo extra_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 SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 7; + * optional .NpcExtraInfo extra_info = 6; * @param value the extraInfo to set * @return this */ @@ -198,11 +198,11 @@ public final class SceneNpcInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 50); output.writeMessageNoTag(extraInfo); } } @@ -226,16 +226,16 @@ public final class SceneNpcInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 24: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 50) { break; } } - case 58: { + case 50: { // extraInfo input.readMessage(extraInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java index 58a66e7..b7de67a 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java @@ -19,20 +19,20 @@ public final class SceneNpcMonsterInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 world_level = 8; + * optional uint32 event_id = 1; + */ + private int eventId; + + /** + * optional uint32 world_level = 10; */ private int worldLevel; /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 12; */ private int monsterId; - /** - * optional uint32 event_id = 13; - */ - private int eventId; - private SceneNpcMonsterInfo() { } @@ -44,99 +44,25 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 world_level = 8; - * @return whether the worldLevel field is set + * optional uint32 event_id = 1; + * @return whether the eventId field is set */ - public boolean hasWorldLevel() { + public boolean hasEventId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 8; - * @return this - */ - public SceneNpcMonsterInfo clearWorldLevel() { - bitField0_ &= ~0x00000001; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 8; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 8; - * @param value the worldLevel to set - * @return this - */ - public SceneNpcMonsterInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000001; - worldLevel = value; - return this; - } - - /** - * optional uint32 monster_id = 10; - * @return whether the monsterId field is set - */ - public boolean hasMonsterId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 monster_id = 10; - * @return this - */ - public SceneNpcMonsterInfo clearMonsterId() { - bitField0_ &= ~0x00000002; - monsterId = 0; - return this; - } - - /** - * optional uint32 monster_id = 10; - * @return the monsterId - */ - public int getMonsterId() { - return monsterId; - } - - /** - * optional uint32 monster_id = 10; - * @param value the monsterId to set - * @return this - */ - public SceneNpcMonsterInfo setMonsterId(final int value) { - bitField0_ |= 0x00000002; - monsterId = value; - return this; - } - - /** - * optional uint32 event_id = 13; - * @return whether the eventId field is set - */ - public boolean hasEventId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 event_id = 13; + * optional uint32 event_id = 1; * @return this */ public SceneNpcMonsterInfo clearEventId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; eventId = 0; return this; } /** - * optional uint32 event_id = 13; + * optional uint32 event_id = 1; * @return the eventId */ public int getEventId() { @@ -144,24 +70,98 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 event_id = 13; + * optional uint32 event_id = 1; * @param value the eventId to set * @return this */ public SceneNpcMonsterInfo setEventId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; eventId = value; return this; } + /** + * optional uint32 world_level = 10; + * @return whether the worldLevel field is set + */ + public boolean hasWorldLevel() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 world_level = 10; + * @return this + */ + public SceneNpcMonsterInfo clearWorldLevel() { + bitField0_ &= ~0x00000002; + worldLevel = 0; + return this; + } + + /** + * optional uint32 world_level = 10; + * @return the worldLevel + */ + public int getWorldLevel() { + return worldLevel; + } + + /** + * optional uint32 world_level = 10; + * @param value the worldLevel to set + * @return this + */ + public SceneNpcMonsterInfo setWorldLevel(final int value) { + bitField0_ |= 0x00000002; + worldLevel = value; + return this; + } + + /** + * optional uint32 monster_id = 12; + * @return whether the monsterId field is set + */ + public boolean hasMonsterId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 monster_id = 12; + * @return this + */ + public SceneNpcMonsterInfo clearMonsterId() { + bitField0_ &= ~0x00000004; + 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 SceneNpcMonsterInfo setMonsterId(final int value) { + bitField0_ |= 0x00000004; + monsterId = value; + return this; + } + @Override public SceneNpcMonsterInfo copyFrom(final SceneNpcMonsterInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + eventId = other.eventId; worldLevel = other.worldLevel; monsterId = other.monsterId; - eventId = other.eventId; } return this; } @@ -172,15 +172,15 @@ public final class SceneNpcMonsterInfoOuterClass { return this; } cachedSize = -1; + if (other.hasEventId()) { + setEventId(other.eventId); + } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } if (other.hasMonsterId()) { setMonsterId(other.monsterId); } - if (other.hasEventId()) { - setEventId(other.eventId); - } return this; } @@ -191,9 +191,9 @@ public final class SceneNpcMonsterInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + eventId = 0; worldLevel = 0; monsterId = 0; - eventId = 0; return this; } @@ -217,24 +217,24 @@ public final class SceneNpcMonsterInfoOuterClass { } SceneNpcMonsterInfo other = (SceneNpcMonsterInfo) o; return bitField0_ == other.bitField0_ + && (!hasEventId() || eventId == other.eventId) && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasMonsterId() || monsterId == other.monsterId) - && (!hasEventId() || eventId == other.eventId); + && (!hasMonsterId() || monsterId == other.monsterId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(monsterId); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(eventId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(monsterId); } } @@ -242,13 +242,13 @@ public final class SceneNpcMonsterInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } return size; } @@ -260,9 +260,9 @@ public final class SceneNpcMonsterInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // worldLevel - worldLevel = input.readUInt32(); + case 8: { + // eventId + eventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 80) { @@ -270,17 +270,17 @@ public final class SceneNpcMonsterInfoOuterClass { } } case 80: { - // monsterId - monsterId = input.readUInt32(); + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { - // eventId - eventId = input.readUInt32(); + case 96: { + // monsterId + monsterId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class SceneNpcMonsterInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.eventId, eventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.monsterId, monsterId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.eventId, eventId); + output.writeUInt32(FieldNames.monsterId, monsterId); } output.endObject(); } @@ -323,12 +323,24 @@ public final class SceneNpcMonsterInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -1376502443: + case 278118624: { + if (input.isAtField(FieldNames.eventId)) { + if (!input.trySkipNullValue()) { + eventId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 440007442: case 1305257111: { if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { worldLevel = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -340,18 +352,6 @@ public final class SceneNpcMonsterInfoOuterClass { if (input.isAtField(FieldNames.monsterId)) { if (!input.trySkipNullValue()) { monsterId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1376502443: - case 278118624: { - if (input.isAtField(FieldNames.eventId)) { - if (!input.trySkipNullValue()) { - eventId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -412,11 +412,11 @@ public final class SceneNpcMonsterInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName eventId = FieldName.forField("eventId", "event_id"); + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); - - static final FieldName eventId = FieldName.forField("eventId", "event_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java index 3376d7a..8bceac8 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 = 12; + * optional .ItemList get_item_list = 6; */ private final ItemListOuterClass.ItemList getItemList = ItemListOuterClass.ItemList.newInstance(); @@ -34,7 +34,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 12; + * optional .ItemList get_item_list = 6; * @return whether the getItemList field is set */ public boolean hasGetItemList() { @@ -42,7 +42,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 12; + * optional .ItemList get_item_list = 6; * @return this */ public ScenePlaneEventScNotify clearGetItemList() { @@ -52,7 +52,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 12; + * optional .ItemList get_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. @@ -66,7 +66,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 12; + * optional .ItemList get_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 @@ -80,7 +80,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 12; + * optional .ItemList get_item_list = 6; * @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) 98); + output.writeRawByte((byte) 50); output.writeMessageNoTag(getItemList); } } @@ -171,7 +171,7 @@ public final class ScenePlaneEventScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 50: { // 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 df77219..f2996f0 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java @@ -20,32 +20,32 @@ public final class ScenePropInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 9; */ private long createTimeMs; /** - * optional uint32 life_time_ms = 4; - */ - private int lifeTimeMs; - - /** - * optional uint32 prop_id = 6; + * optional uint32 prop_id = 10; */ private int propId; /** - * optional uint32 prop_state = 9; + * optional uint32 life_time_ms = 11; + */ + private int lifeTimeMs; + + /** + * optional uint32 prop_state = 12; */ private int propState; /** - * optional .PropExtraInfo extra_info = 7; + * optional .PropExtraInfo extra_info = 5; */ private final PropExtraInfoOuterClass.PropExtraInfo extraInfo = PropExtraInfoOuterClass.PropExtraInfo.newInstance(); /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 14; */ private final RepeatedString triggerNameList = RepeatedString.newEmptyInstance(); @@ -60,7 +60,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 9; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -68,7 +68,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 9; * @return this */ public ScenePropInfo clearCreateTimeMs() { @@ -78,7 +78,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 9; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -86,7 +86,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 9; * @param value the createTimeMs to set * @return this */ @@ -97,62 +97,25 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 4; - * @return whether the lifeTimeMs field is set + * optional uint32 prop_id = 10; + * @return whether the propId field is set */ - public boolean hasLifeTimeMs() { + public boolean hasPropId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 life_time_ms = 4; - * @return this - */ - public ScenePropInfo clearLifeTimeMs() { - bitField0_ &= ~0x00000002; - lifeTimeMs = 0; - return this; - } - - /** - * optional uint32 life_time_ms = 4; - * @return the lifeTimeMs - */ - public int getLifeTimeMs() { - return lifeTimeMs; - } - - /** - * optional uint32 life_time_ms = 4; - * @param value the lifeTimeMs to set - * @return this - */ - public ScenePropInfo setLifeTimeMs(final int value) { - bitField0_ |= 0x00000002; - lifeTimeMs = value; - return this; - } - - /** - * optional uint32 prop_id = 6; - * @return whether the propId field is set - */ - public boolean hasPropId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 prop_id = 6; + * optional uint32 prop_id = 10; * @return this */ public ScenePropInfo clearPropId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; propId = 0; return this; } /** - * optional uint32 prop_id = 6; + * optional uint32 prop_id = 10; * @return the propId */ public int getPropId() { @@ -160,18 +123,55 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 6; + * optional uint32 prop_id = 10; * @param value the propId to set * @return this */ public ScenePropInfo setPropId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; propId = value; return this; } /** - * optional uint32 prop_state = 9; + * optional uint32 life_time_ms = 11; + * @return whether the lifeTimeMs field is set + */ + public boolean hasLifeTimeMs() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 life_time_ms = 11; + * @return this + */ + public ScenePropInfo clearLifeTimeMs() { + bitField0_ &= ~0x00000004; + lifeTimeMs = 0; + return this; + } + + /** + * optional uint32 life_time_ms = 11; + * @return the lifeTimeMs + */ + public int getLifeTimeMs() { + return lifeTimeMs; + } + + /** + * optional uint32 life_time_ms = 11; + * @param value the lifeTimeMs to set + * @return this + */ + public ScenePropInfo setLifeTimeMs(final int value) { + bitField0_ |= 0x00000004; + lifeTimeMs = value; + return this; + } + + /** + * optional uint32 prop_state = 12; * @return whether the propState field is set */ public boolean hasPropState() { @@ -179,7 +179,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 9; + * optional uint32 prop_state = 12; * @return this */ public ScenePropInfo clearPropState() { @@ -189,7 +189,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 9; + * optional uint32 prop_state = 12; * @return the propState */ public int getPropState() { @@ -197,7 +197,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 9; + * optional uint32 prop_state = 12; * @param value the propState to set * @return this */ @@ -208,7 +208,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 7; + * optional .PropExtraInfo extra_info = 5; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -216,7 +216,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 7; + * optional .PropExtraInfo extra_info = 5; * @return this */ public ScenePropInfo clearExtraInfo() { @@ -226,7 +226,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 7; + * optional .PropExtraInfo extra_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. @@ -240,7 +240,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 7; + * optional .PropExtraInfo extra_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 @@ -254,7 +254,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 7; + * optional .PropExtraInfo extra_info = 5; * @param value the extraInfo to set * @return this */ @@ -265,7 +265,7 @@ public final class ScenePropInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 14; * @return whether the triggerNameList field is set */ public boolean hasTriggerNameList() { @@ -273,7 +273,7 @@ public final class ScenePropInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 14; * @return this */ public ScenePropInfo clearTriggerNameList() { @@ -283,7 +283,7 @@ public final class ScenePropInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_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. @@ -297,7 +297,7 @@ public final class ScenePropInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_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 @@ -311,7 +311,7 @@ public final class ScenePropInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 14; * @param value the triggerNameList to add * @return this */ @@ -322,7 +322,7 @@ public final class ScenePropInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 14; * @param values the triggerNameList to add * @return this */ @@ -338,8 +338,8 @@ public final class ScenePropInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; - lifeTimeMs = other.lifeTimeMs; propId = other.propId; + lifeTimeMs = other.lifeTimeMs; propState = other.propState; extraInfo.copyFrom(other.extraInfo); triggerNameList.copyFrom(other.triggerNameList); @@ -356,12 +356,12 @@ public final class ScenePropInfoOuterClass { if (other.hasCreateTimeMs()) { setCreateTimeMs(other.createTimeMs); } - if (other.hasLifeTimeMs()) { - setLifeTimeMs(other.lifeTimeMs); - } if (other.hasPropId()) { setPropId(other.propId); } + if (other.hasLifeTimeMs()) { + setLifeTimeMs(other.lifeTimeMs); + } if (other.hasPropState()) { setPropState(other.propState); } @@ -382,8 +382,8 @@ public final class ScenePropInfoOuterClass { cachedSize = -1; bitField0_ = 0; createTimeMs = 0L; - lifeTimeMs = 0; propId = 0; + lifeTimeMs = 0; propState = 0; extraInfo.clear(); triggerNameList.clear(); @@ -413,8 +413,8 @@ public final class ScenePropInfoOuterClass { ScenePropInfo other = (ScenePropInfo) o; return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) - && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) && (!hasPropId() || propId == other.propId) + && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) && (!hasPropState() || propState == other.propState) && (!hasExtraInfo() || extraInfo.equals(other.extraInfo)) && (!hasTriggerNameList() || triggerNameList.equals(other.triggerNameList)); @@ -423,28 +423,28 @@ public final class ScenePropInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(lifeTimeMs); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(propId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(lifeTimeMs); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(propState); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(extraInfo); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < triggerNameList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 114); output.writeStringNoTag(triggerNameList.get(i)); } } @@ -457,10 +457,10 @@ public final class ScenePropInfoOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); @@ -481,52 +481,52 @@ public final class ScenePropInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 72: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 80) { break; } } - case 32: { - // lifeTimeMs - lifeTimeMs = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 80: { // propId propId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 88) { break; } } - case 72: { + case 88: { + // lifeTimeMs + lifeTimeMs = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // propState propState = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 58) { + if (tag != 42) { break; } } - case 58: { + case 42: { // extraInfo input.readMessage(extraInfo); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { + case 114: { // triggerNameList tag = input.readRepeatedString(triggerNameList, tag); bitField0_ |= 0x00000020; @@ -555,10 +555,10 @@ public final class ScenePropInfoOuterClass { output.writeUInt64(FieldNames.createTimeMs, createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); + output.writeUInt32(FieldNames.propId, propId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.propId, propId); + output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.propState, propState); @@ -591,11 +591,11 @@ public final class ScenePropInfoOuterClass { } break; } - case -1226028177: - case 1665182229: { - if (input.isAtField(FieldNames.lifeTimeMs)) { + case -979804194: + case -309137545: { + if (input.isAtField(FieldNames.propId)) { if (!input.trySkipNullValue()) { - lifeTimeMs = input.readUInt32(); + propId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -603,11 +603,11 @@ public final class ScenePropInfoOuterClass { } break; } - case -979804194: - case -309137545: { - if (input.isAtField(FieldNames.propId)) { + case -1226028177: + case 1665182229: { + if (input.isAtField(FieldNames.lifeTimeMs)) { if (!input.trySkipNullValue()) { - propId = input.readUInt32(); + lifeTimeMs = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -705,10 +705,10 @@ public final class ScenePropInfoOuterClass { static class FieldNames { static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms"); - static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); - static final FieldName propId = FieldName.forField("propId", "prop_id"); + static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); + static final FieldName propState = FieldName.forField("propState", "prop_state"); static final FieldName extraInfo = FieldName.forField("extraInfo", "extra_info"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java index 62c4cb3..330e9f2 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java @@ -20,39 +20,39 @@ public final class SceneSummonUnitInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 11; */ private long createTimeMs; /** * 
-     *  KADBHDIAEOE
+     *  DPAPIBILMKB
      *
* - * optional uint32 caster_entity_id = 4; - */ - private int casterEntityId; - - /** - * 
-     *  GEOEIBPBPLA
-     *
- * - * optional uint32 attach_entity_id = 10; + * optional uint32 attach_entity_id = 4; */ private int attachEntityId; /** * 
-     *  GEEKOBFDDCK summon_unit_id
+     *  KGGENGIBIAJ
      *
* - * optional uint32 summon_unit_id = 14; + * optional uint32 caster_entity_id = 7; + */ + private int casterEntityId; + + /** + * 
+     *  ILNGLEEMFCF
+     *
+ * + * optional uint32 summon_unit_id = 9; */ private int summonUnitId; /** - * optional sint32 life_time_ms = 15; + * optional sint32 life_time_ms = 5; */ private int lifeTimeMs; @@ -72,7 +72,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 11; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -80,7 +80,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 11; * @return this */ public SceneSummonUnitInfo clearCreateTimeMs() { @@ -90,7 +90,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 11; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -98,7 +98,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 11; * @param value the createTimeMs to set * @return this */ @@ -110,89 +110,36 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  KADBHDIAEOE
+     *  DPAPIBILMKB
      *
* - * optional uint32 caster_entity_id = 4; - * @return whether the casterEntityId field is set + * optional uint32 attach_entity_id = 4; + * @return whether the attachEntityId field is set */ - public boolean hasCasterEntityId() { + public boolean hasAttachEntityId() { return (bitField0_ & 0x00000002) != 0; } /** * 
-     *  KADBHDIAEOE
+     *  DPAPIBILMKB
      *
* - * optional uint32 caster_entity_id = 4; - * @return this - */ - public SceneSummonUnitInfo clearCasterEntityId() { - bitField0_ &= ~0x00000002; - casterEntityId = 0; - return this; - } - - /** - * 
-     *  KADBHDIAEOE
-     *
- * - * optional uint32 caster_entity_id = 4; - * @return the casterEntityId - */ - public int getCasterEntityId() { - return casterEntityId; - } - - /** - * 
-     *  KADBHDIAEOE
-     *
- * - * optional uint32 caster_entity_id = 4; - * @param value the casterEntityId to set - * @return this - */ - public SceneSummonUnitInfo setCasterEntityId(final int value) { - bitField0_ |= 0x00000002; - casterEntityId = value; - return this; - } - - /** - * 
-     *  GEOEIBPBPLA
-     *
- * - * optional uint32 attach_entity_id = 10; - * @return whether the attachEntityId field is set - */ - public boolean hasAttachEntityId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     *  GEOEIBPBPLA
-     *
- * - * optional uint32 attach_entity_id = 10; + * optional uint32 attach_entity_id = 4; * @return this */ public SceneSummonUnitInfo clearAttachEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; attachEntityId = 0; return this; } /** * 
-     *  GEOEIBPBPLA
+     *  DPAPIBILMKB
      *
* - * optional uint32 attach_entity_id = 10; + * optional uint32 attach_entity_id = 4; * @return the attachEntityId */ public int getAttachEntityId() { @@ -201,25 +148,78 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  GEOEIBPBPLA
+     *  DPAPIBILMKB
      *
* - * optional uint32 attach_entity_id = 10; + * optional uint32 attach_entity_id = 4; * @param value the attachEntityId to set * @return this */ public SceneSummonUnitInfo setAttachEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; attachEntityId = value; return this; } /** * 
-     *  GEEKOBFDDCK summon_unit_id
+     *  KGGENGIBIAJ
      *
* - * optional uint32 summon_unit_id = 14; + * optional uint32 caster_entity_id = 7; + * @return whether the casterEntityId field is set + */ + public boolean hasCasterEntityId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * 
+     *  KGGENGIBIAJ
+     *
+ * + * optional uint32 caster_entity_id = 7; + * @return this + */ + public SceneSummonUnitInfo clearCasterEntityId() { + bitField0_ &= ~0x00000004; + casterEntityId = 0; + return this; + } + + /** + * 
+     *  KGGENGIBIAJ
+     *
+ * + * optional uint32 caster_entity_id = 7; + * @return the casterEntityId + */ + public int getCasterEntityId() { + return casterEntityId; + } + + /** + * 
+     *  KGGENGIBIAJ
+     *
+ * + * optional uint32 caster_entity_id = 7; + * @param value the casterEntityId to set + * @return this + */ + public SceneSummonUnitInfo setCasterEntityId(final int value) { + bitField0_ |= 0x00000004; + casterEntityId = value; + return this; + } + + /** + * 
+     *  ILNGLEEMFCF
+     *
+ * + * optional uint32 summon_unit_id = 9; * @return whether the summonUnitId field is set */ public boolean hasSummonUnitId() { @@ -228,10 +228,10 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  GEEKOBFDDCK summon_unit_id
+     *  ILNGLEEMFCF
      *
* - * optional uint32 summon_unit_id = 14; + * optional uint32 summon_unit_id = 9; * @return this */ public SceneSummonUnitInfo clearSummonUnitId() { @@ -242,10 +242,10 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  GEEKOBFDDCK summon_unit_id
+     *  ILNGLEEMFCF
      *
* - * optional uint32 summon_unit_id = 14; + * optional uint32 summon_unit_id = 9; * @return the summonUnitId */ public int getSummonUnitId() { @@ -254,10 +254,10 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  GEEKOBFDDCK summon_unit_id
+     *  ILNGLEEMFCF
      *
* - * optional uint32 summon_unit_id = 14; + * optional uint32 summon_unit_id = 9; * @param value the summonUnitId to set * @return this */ @@ -268,7 +268,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 15; + * optional sint32 life_time_ms = 5; * @return whether the lifeTimeMs field is set */ public boolean hasLifeTimeMs() { @@ -276,7 +276,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 15; + * optional sint32 life_time_ms = 5; * @return this */ public SceneSummonUnitInfo clearLifeTimeMs() { @@ -286,7 +286,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 15; + * optional sint32 life_time_ms = 5; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -294,7 +294,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 15; + * optional sint32 life_time_ms = 5; * @param value the lifeTimeMs to set * @return this */ @@ -378,8 +378,8 @@ public final class SceneSummonUnitInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; - casterEntityId = other.casterEntityId; attachEntityId = other.attachEntityId; + casterEntityId = other.casterEntityId; summonUnitId = other.summonUnitId; lifeTimeMs = other.lifeTimeMs; triggerNameList.copyFrom(other.triggerNameList); @@ -396,12 +396,12 @@ public final class SceneSummonUnitInfoOuterClass { if (other.hasCreateTimeMs()) { setCreateTimeMs(other.createTimeMs); } - if (other.hasCasterEntityId()) { - setCasterEntityId(other.casterEntityId); - } if (other.hasAttachEntityId()) { setAttachEntityId(other.attachEntityId); } + if (other.hasCasterEntityId()) { + setCasterEntityId(other.casterEntityId); + } if (other.hasSummonUnitId()) { setSummonUnitId(other.summonUnitId); } @@ -422,8 +422,8 @@ public final class SceneSummonUnitInfoOuterClass { cachedSize = -1; bitField0_ = 0; createTimeMs = 0L; - casterEntityId = 0; attachEntityId = 0; + casterEntityId = 0; summonUnitId = 0; lifeTimeMs = 0; triggerNameList.clear(); @@ -452,8 +452,8 @@ public final class SceneSummonUnitInfoOuterClass { SceneSummonUnitInfo other = (SceneSummonUnitInfo) o; return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) - && (!hasCasterEntityId() || casterEntityId == other.casterEntityId) && (!hasAttachEntityId() || attachEntityId == other.attachEntityId) + && (!hasCasterEntityId() || casterEntityId == other.casterEntityId) && (!hasSummonUnitId() || summonUnitId == other.summonUnitId) && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) && (!hasTriggerNameList() || triggerNameList.equals(other.triggerNameList)); @@ -462,23 +462,23 @@ public final class SceneSummonUnitInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(casterEntityId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); output.writeUInt32NoTag(attachEntityId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(casterEntityId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(summonUnitId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeSInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000020) != 0) { @@ -496,10 +496,10 @@ public final class SceneSummonUnitInfoOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(casterEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attachEntityId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attachEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(casterEntityId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(summonUnitId); @@ -520,7 +520,7 @@ public final class SceneSummonUnitInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 88: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; @@ -530,33 +530,33 @@ public final class SceneSummonUnitInfoOuterClass { } } case 32: { - // casterEntityId - casterEntityId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { // attachEntityId attachEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 56) { break; } } - case 112: { + case 56: { + // casterEntityId + casterEntityId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // summonUnitId summonUnitId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 120) { + if (tag != 40) { break; } } - case 120: { + case 40: { // lifeTimeMs lifeTimeMs = input.readSInt32(); bitField0_ |= 0x00000010; @@ -594,10 +594,10 @@ public final class SceneSummonUnitInfoOuterClass { output.writeUInt64(FieldNames.createTimeMs, createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.casterEntityId, casterEntityId); + output.writeUInt32(FieldNames.attachEntityId, attachEntityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.attachEntityId, attachEntityId); + output.writeUInt32(FieldNames.casterEntityId, casterEntityId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.summonUnitId, summonUnitId); @@ -630,11 +630,11 @@ public final class SceneSummonUnitInfoOuterClass { } break; } - case -1831162710: - case -1550367068: { - if (input.isAtField(FieldNames.casterEntityId)) { + case -900612669: + case -644975235: { + if (input.isAtField(FieldNames.attachEntityId)) { if (!input.trySkipNullValue()) { - casterEntityId = input.readUInt32(); + attachEntityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -642,11 +642,11 @@ public final class SceneSummonUnitInfoOuterClass { } break; } - case -900612669: - case -644975235: { - if (input.isAtField(FieldNames.attachEntityId)) { + case -1831162710: + case -1550367068: { + if (input.isAtField(FieldNames.casterEntityId)) { if (!input.trySkipNullValue()) { - attachEntityId = input.readUInt32(); + casterEntityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -745,10 +745,10 @@ public final class SceneSummonUnitInfoOuterClass { static class FieldNames { static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms"); - static final FieldName casterEntityId = FieldName.forField("casterEntityId", "caster_entity_id"); - static final FieldName attachEntityId = FieldName.forField("attachEntityId", "attach_entity_id"); + static final FieldName casterEntityId = FieldName.forField("casterEntityId", "caster_entity_id"); + static final FieldName summonUnitId = FieldName.forField("summonUnitId", "summon_unit_id"); static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java index abb6fea..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 = 7; + * 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 = 7; + * 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 = 7; + * repeated uint32 search_uid_list = 6; * @return this */ public SearchPlayerCsReq clearSearchUidList() { @@ -53,7 +53,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 7; + * 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 = 7; + * 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 = 7; + * 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 = 7; + * 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) 56); + 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 58: { + case 50: { // searchUidList [packed=true] input.readPackedUInt32(searchUidList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class SearchPlayerCsReqOuterClass { tag = input.readTag(); break; } - case 56: { + 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 cd57701..254a70e 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 = 9; */ private int retcode; /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 11; */ private final RepeatedMessage searchResultList = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @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 = 9; * @return this */ public SearchPlayerScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 11; * @return whether the searchResultList field is set */ public boolean hasSearchResultList() { @@ -85,7 +85,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 11; * @return this */ public SearchPlayerScRsp clearSearchResultList() { @@ -95,7 +95,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_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 SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_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 SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 11; * @param value the searchResultList to add * @return this */ @@ -134,7 +134,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 11; * @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) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < searchResultList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 90); output.writeMessageNoTag(searchResultList.get(i)); } } @@ -241,16 +241,16 @@ public final class SearchPlayerScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 90) { break; } } - case 122: { + case 90: { // 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 7b87f47..ce015b0 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 = 9; + * optional uint32 bubble_id = 8; */ private int bubbleId; @@ -34,7 +34,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 9; + * optional uint32 bubble_id = 8; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 9; + * optional uint32 bubble_id = 8; * @return this */ public SelectChatBubbleCsReq clearBubbleId() { @@ -52,7 +52,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 9; + * optional uint32 bubble_id = 8; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 9; + * optional uint32 bubble_id = 8; * @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) 72); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public final class SelectChatBubbleCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 64: { // bubbleId bubbleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java index ec0e39e..bd33b95 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SelectPhoneThemeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 13; */ private int themeId; @@ -34,7 +34,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 13; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 13; * @return this */ public SelectPhoneThemeCsReq clearThemeId() { @@ -52,7 +52,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 13; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 13; * @param value the themeId to set * @return this */ @@ -129,7 +129,7 @@ public final class SelectPhoneThemeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public final class SelectPhoneThemeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 104: { // themeId themeId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java index f4d6519..c93f4e7 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java @@ -19,9 +19,9 @@ public final class SelectPhoneThemeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 NNKFBKLCDDF = 3; + * optional uint32 cur_phone_theme = 5; */ - private int nNKFBKLCDDF; + private int curPhoneTheme; /** * optional uint32 retcode = 7; @@ -29,9 +29,9 @@ public final class SelectPhoneThemeScRspOuterClass { private int retcode; /** - * optional uint32 cur_phone_theme = 9; + * optional uint32 NNKFBKLCDDF = 11; */ - private int curPhoneTheme; + private int nNKFBKLCDDF; private SelectPhoneThemeScRsp() { } @@ -44,39 +44,39 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 NNKFBKLCDDF = 3; - * @return whether the nNKFBKLCDDF field is set + * optional uint32 cur_phone_theme = 5; + * @return whether the curPhoneTheme field is set */ - public boolean hasNNKFBKLCDDF() { + public boolean hasCurPhoneTheme() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 NNKFBKLCDDF = 3; + * optional uint32 cur_phone_theme = 5; * @return this */ - public SelectPhoneThemeScRsp clearNNKFBKLCDDF() { + public SelectPhoneThemeScRsp clearCurPhoneTheme() { bitField0_ &= ~0x00000001; - nNKFBKLCDDF = 0; + curPhoneTheme = 0; return this; } /** - * optional uint32 NNKFBKLCDDF = 3; - * @return the nNKFBKLCDDF + * optional uint32 cur_phone_theme = 5; + * @return the curPhoneTheme */ - public int getNNKFBKLCDDF() { - return nNKFBKLCDDF; + public int getCurPhoneTheme() { + return curPhoneTheme; } /** - * optional uint32 NNKFBKLCDDF = 3; - * @param value the nNKFBKLCDDF to set + * optional uint32 cur_phone_theme = 5; + * @param value the curPhoneTheme to set * @return this */ - public SelectPhoneThemeScRsp setNNKFBKLCDDF(final int value) { + public SelectPhoneThemeScRsp setCurPhoneTheme(final int value) { bitField0_ |= 0x00000001; - nNKFBKLCDDF = value; + curPhoneTheme = value; return this; } @@ -118,39 +118,39 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 9; - * @return whether the curPhoneTheme field is set + * optional uint32 NNKFBKLCDDF = 11; + * @return whether the nNKFBKLCDDF field is set */ - public boolean hasCurPhoneTheme() { + public boolean hasNNKFBKLCDDF() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 cur_phone_theme = 9; + * optional uint32 NNKFBKLCDDF = 11; * @return this */ - public SelectPhoneThemeScRsp clearCurPhoneTheme() { + public SelectPhoneThemeScRsp clearNNKFBKLCDDF() { bitField0_ &= ~0x00000004; - curPhoneTheme = 0; + nNKFBKLCDDF = 0; return this; } /** - * optional uint32 cur_phone_theme = 9; - * @return the curPhoneTheme + * optional uint32 NNKFBKLCDDF = 11; + * @return the nNKFBKLCDDF */ - public int getCurPhoneTheme() { - return curPhoneTheme; + public int getNNKFBKLCDDF() { + return nNKFBKLCDDF; } /** - * optional uint32 cur_phone_theme = 9; - * @param value the curPhoneTheme to set + * optional uint32 NNKFBKLCDDF = 11; + * @param value the nNKFBKLCDDF to set * @return this */ - public SelectPhoneThemeScRsp setCurPhoneTheme(final int value) { + public SelectPhoneThemeScRsp setNNKFBKLCDDF(final int value) { bitField0_ |= 0x00000004; - curPhoneTheme = value; + nNKFBKLCDDF = value; return this; } @@ -159,9 +159,9 @@ public final class SelectPhoneThemeScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - nNKFBKLCDDF = other.nNKFBKLCDDF; - retcode = other.retcode; curPhoneTheme = other.curPhoneTheme; + retcode = other.retcode; + nNKFBKLCDDF = other.nNKFBKLCDDF; } return this; } @@ -172,14 +172,14 @@ public final class SelectPhoneThemeScRspOuterClass { return this; } cachedSize = -1; - if (other.hasNNKFBKLCDDF()) { - setNNKFBKLCDDF(other.nNKFBKLCDDF); + if (other.hasCurPhoneTheme()) { + setCurPhoneTheme(other.curPhoneTheme); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasCurPhoneTheme()) { - setCurPhoneTheme(other.curPhoneTheme); + if (other.hasNNKFBKLCDDF()) { + setNNKFBKLCDDF(other.nNKFBKLCDDF); } return this; } @@ -191,9 +191,9 @@ public final class SelectPhoneThemeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - nNKFBKLCDDF = 0; - retcode = 0; curPhoneTheme = 0; + retcode = 0; + nNKFBKLCDDF = 0; return this; } @@ -217,24 +217,24 @@ public final class SelectPhoneThemeScRspOuterClass { } SelectPhoneThemeScRsp other = (SelectPhoneThemeScRsp) o; return bitField0_ == other.bitField0_ - && (!hasNNKFBKLCDDF() || nNKFBKLCDDF == other.nNKFBKLCDDF) + && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme) && (!hasRetcode() || retcode == other.retcode) - && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme); + && (!hasNNKFBKLCDDF() || nNKFBKLCDDF == other.nNKFBKLCDDF); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(nNKFBKLCDDF); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(curPhoneTheme); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(nNKFBKLCDDF); } } @@ -242,13 +242,13 @@ public final class SelectPhoneThemeScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nNKFBKLCDDF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); + size += 1 + ProtoSink.computeUInt32SizeNoTag(nNKFBKLCDDF); } return size; } @@ -260,9 +260,9 @@ public final class SelectPhoneThemeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // nNKFBKLCDDF - nNKFBKLCDDF = input.readUInt32(); + case 40: { + // curPhoneTheme + curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 56) { @@ -274,13 +274,13 @@ public final class SelectPhoneThemeScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 88) { break; } } - case 72: { - // curPhoneTheme - curPhoneTheme = input.readUInt32(); + case 88: { + // nNKFBKLCDDF + nNKFBKLCDDF = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class SelectPhoneThemeScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.nNKFBKLCDDF, nNKFBKLCDDF); + output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); + output.writeUInt32(FieldNames.nNKFBKLCDDF, nNKFBKLCDDF); } output.endObject(); } @@ -323,10 +323,11 @@ public final class SelectPhoneThemeScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -883757877: { - if (input.isAtField(FieldNames.nNKFBKLCDDF)) { + case 405670747: + case -514634695: { + if (input.isAtField(FieldNames.curPhoneTheme)) { if (!input.trySkipNullValue()) { - nNKFBKLCDDF = input.readUInt32(); + curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -345,11 +346,10 @@ public final class SelectPhoneThemeScRspOuterClass { } break; } - case 405670747: - case -514634695: { - if (input.isAtField(FieldNames.curPhoneTheme)) { + case -883757877: { + if (input.isAtField(FieldNames.nNKFBKLCDDF)) { if (!input.trySkipNullValue()) { - curPhoneTheme = input.readUInt32(); + nNKFBKLCDDF = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -410,11 +410,11 @@ public final class SelectPhoneThemeScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName nNKFBKLCDDF = FieldName.forField("NNKFBKLCDDF"); + static final FieldName curPhoneTheme = FieldName.forField("curPhoneTheme", "cur_phone_theme"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curPhoneTheme = FieldName.forField("curPhoneTheme", "cur_phone_theme"); + static final FieldName nNKFBKLCDDF = FieldName.forField("NNKFBKLCDDF"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueCommonDialogueOptionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueCommonDialogueOptionCsReqOuterClass.java index 02770c3..a3bd5b2 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueCommonDialogueOptionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueCommonDialogueOptionCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_unique_id = 4; - */ - private int eventUniqueId; - - /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 3; */ private int optionId; + /** + * optional uint32 event_unique_id = 14; + */ + private int eventUniqueId; + private SelectRogueCommonDialogueOptionCsReq() { } @@ -39,62 +39,25 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { } /** - * optional uint32 event_unique_id = 4; - * @return whether the eventUniqueId field is set + * optional uint32 option_id = 3; + * @return whether the optionId field is set */ - public boolean hasEventUniqueId() { + public boolean hasOptionId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 event_unique_id = 4; - * @return this - */ - public SelectRogueCommonDialogueOptionCsReq clearEventUniqueId() { - bitField0_ &= ~0x00000001; - eventUniqueId = 0; - return this; - } - - /** - * optional uint32 event_unique_id = 4; - * @return the eventUniqueId - */ - public int getEventUniqueId() { - return eventUniqueId; - } - - /** - * optional uint32 event_unique_id = 4; - * @param value the eventUniqueId to set - * @return this - */ - public SelectRogueCommonDialogueOptionCsReq setEventUniqueId(final int value) { - bitField0_ |= 0x00000001; - eventUniqueId = value; - return this; - } - - /** - * optional uint32 option_id = 9; - * @return whether the optionId field is set - */ - public boolean hasOptionId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 3; * @return this */ public SelectRogueCommonDialogueOptionCsReq clearOptionId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; optionId = 0; return this; } /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 3; * @return the optionId */ public int getOptionId() { @@ -102,24 +65,61 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { } /** - * optional uint32 option_id = 9; + * optional uint32 option_id = 3; * @param value the optionId to set * @return this */ public SelectRogueCommonDialogueOptionCsReq setOptionId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; optionId = value; return this; } + /** + * optional uint32 event_unique_id = 14; + * @return whether the eventUniqueId field is set + */ + public boolean hasEventUniqueId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 event_unique_id = 14; + * @return this + */ + public SelectRogueCommonDialogueOptionCsReq clearEventUniqueId() { + bitField0_ &= ~0x00000002; + eventUniqueId = 0; + return this; + } + + /** + * optional uint32 event_unique_id = 14; + * @return the eventUniqueId + */ + public int getEventUniqueId() { + return eventUniqueId; + } + + /** + * optional uint32 event_unique_id = 14; + * @param value the eventUniqueId to set + * @return this + */ + public SelectRogueCommonDialogueOptionCsReq setEventUniqueId(final int value) { + bitField0_ |= 0x00000002; + eventUniqueId = value; + return this; + } + @Override public SelectRogueCommonDialogueOptionCsReq copyFrom( final SelectRogueCommonDialogueOptionCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eventUniqueId = other.eventUniqueId; optionId = other.optionId; + eventUniqueId = other.eventUniqueId; } return this; } @@ -131,12 +131,12 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEventUniqueId()) { - setEventUniqueId(other.eventUniqueId); - } if (other.hasOptionId()) { setOptionId(other.optionId); } + if (other.hasEventUniqueId()) { + setEventUniqueId(other.eventUniqueId); + } return this; } @@ -147,8 +147,8 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - eventUniqueId = 0; optionId = 0; + eventUniqueId = 0; return this; } @@ -172,19 +172,19 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { } SelectRogueCommonDialogueOptionCsReq other = (SelectRogueCommonDialogueOptionCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId) - && (!hasOptionId() || optionId == other.optionId); + && (!hasOptionId() || optionId == other.optionId) + && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(eventUniqueId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(optionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(optionId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(eventUniqueId); } } @@ -192,10 +192,10 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(optionId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(optionId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId); } return size; } @@ -208,18 +208,18 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // eventUniqueId - eventUniqueId = input.readUInt32(); + case 24: { + // optionId + optionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { - // optionId - optionId = input.readUInt32(); + case 112: { + // eventUniqueId + eventUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -244,10 +244,10 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId); + output.writeUInt32(FieldNames.optionId, optionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.optionId, optionId); + output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId); } output.endObject(); } @@ -260,11 +260,11 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2091680134: - case -157385500: { - if (input.isAtField(FieldNames.eventUniqueId)) { + case -79017872: + case 1845434661: { + if (input.isAtField(FieldNames.optionId)) { if (!input.trySkipNullValue()) { - eventUniqueId = input.readUInt32(); + optionId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -272,11 +272,11 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { } break; } - case -79017872: - case 1845434661: { - if (input.isAtField(FieldNames.optionId)) { + case 2091680134: + case -157385500: { + if (input.isAtField(FieldNames.eventUniqueId)) { if (!input.trySkipNullValue()) { - optionId = input.readUInt32(); + eventUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -339,9 +339,9 @@ public final class SelectRogueCommonDialogueOptionCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id"); - static final FieldName optionId = FieldName.forField("optionId", "option_id"); + + static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueCommonDialogueOptionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueCommonDialogueOptionScRspOuterClass.java index 5abf53c..bdc29f3 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueCommonDialogueOptionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueCommonDialogueOptionScRspOuterClass.java @@ -20,32 +20,32 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; - */ - private int retcode; - - /** - * optional uint32 option_id = 10; + * optional uint32 option_id = 2; */ private int optionId; /** - * optional uint32 event_unique_id = 12; + * optional uint32 retcode = 8; + */ + private int retcode; + + /** + * optional uint32 event_unique_id = 9; */ private int eventUniqueId; /** - * optional bool event_has_effect = 8; + * optional bool event_has_effect = 6; */ private boolean eventHasEffect; /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 4; + * optional .RogueCommonDialogueDataInfo dialogue_data = 10; */ private final RogueCommonDialogueDataInfoOuterClass.RogueCommonDialogueDataInfo dialogueData = RogueCommonDialogueDataInfoOuterClass.RogueCommonDialogueDataInfo.newInstance(); /** - * repeated uint32 effect_event_id_list = 1; + * repeated uint32 effect_event_id_list = 3; */ private final RepeatedInt effectEventIdList = RepeatedInt.newEmptyInstance(); @@ -60,62 +60,25 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional uint32 retcode = 2; - * @return whether the retcode field is set + * optional uint32 option_id = 2; + * @return whether the optionId field is set */ - public boolean hasRetcode() { + public boolean hasOptionId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 2; - * @return this - */ - public SelectRogueCommonDialogueOptionScRsp 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 SelectRogueCommonDialogueOptionScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 option_id = 10; - * @return whether the optionId field is set - */ - public boolean hasOptionId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 option_id = 10; + * optional uint32 option_id = 2; * @return this */ public SelectRogueCommonDialogueOptionScRsp clearOptionId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; optionId = 0; return this; } /** - * optional uint32 option_id = 10; + * optional uint32 option_id = 2; * @return the optionId */ public int getOptionId() { @@ -123,18 +86,55 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional uint32 option_id = 10; + * optional uint32 option_id = 2; * @param value the optionId to set * @return this */ public SelectRogueCommonDialogueOptionScRsp setOptionId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; optionId = value; return this; } /** - * optional uint32 event_unique_id = 12; + * 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 SelectRogueCommonDialogueOptionScRsp 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 SelectRogueCommonDialogueOptionScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 event_unique_id = 9; * @return whether the eventUniqueId field is set */ public boolean hasEventUniqueId() { @@ -142,7 +142,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional uint32 event_unique_id = 12; + * optional uint32 event_unique_id = 9; * @return this */ public SelectRogueCommonDialogueOptionScRsp clearEventUniqueId() { @@ -152,7 +152,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional uint32 event_unique_id = 12; + * optional uint32 event_unique_id = 9; * @return the eventUniqueId */ public int getEventUniqueId() { @@ -160,7 +160,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional uint32 event_unique_id = 12; + * optional uint32 event_unique_id = 9; * @param value the eventUniqueId to set * @return this */ @@ -171,7 +171,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional bool event_has_effect = 8; + * optional bool event_has_effect = 6; * @return whether the eventHasEffect field is set */ public boolean hasEventHasEffect() { @@ -179,7 +179,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional bool event_has_effect = 8; + * optional bool event_has_effect = 6; * @return this */ public SelectRogueCommonDialogueOptionScRsp clearEventHasEffect() { @@ -189,7 +189,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional bool event_has_effect = 8; + * optional bool event_has_effect = 6; * @return the eventHasEffect */ public boolean getEventHasEffect() { @@ -197,7 +197,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional bool event_has_effect = 8; + * optional bool event_has_effect = 6; * @param value the eventHasEffect to set * @return this */ @@ -208,7 +208,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 4; + * optional .RogueCommonDialogueDataInfo dialogue_data = 10; * @return whether the dialogueData field is set */ public boolean hasDialogueData() { @@ -216,7 +216,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 4; + * optional .RogueCommonDialogueDataInfo dialogue_data = 10; * @return this */ public SelectRogueCommonDialogueOptionScRsp clearDialogueData() { @@ -226,7 +226,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 4; + * optional .RogueCommonDialogueDataInfo dialogue_data = 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. @@ -240,7 +240,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 4; + * optional .RogueCommonDialogueDataInfo dialogue_data = 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 @@ -255,7 +255,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 4; + * optional .RogueCommonDialogueDataInfo dialogue_data = 10; * @param value the dialogueData to set * @return this */ @@ -267,7 +267,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * repeated uint32 effect_event_id_list = 1; + * repeated uint32 effect_event_id_list = 3; * @return whether the effectEventIdList field is set */ public boolean hasEffectEventIdList() { @@ -275,7 +275,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * repeated uint32 effect_event_id_list = 1; + * repeated uint32 effect_event_id_list = 3; * @return this */ public SelectRogueCommonDialogueOptionScRsp clearEffectEventIdList() { @@ -285,7 +285,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * repeated uint32 effect_event_id_list = 1; + * repeated uint32 effect_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. @@ -299,7 +299,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * repeated uint32 effect_event_id_list = 1; + * repeated uint32 effect_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 @@ -313,7 +313,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * repeated uint32 effect_event_id_list = 1; + * repeated uint32 effect_event_id_list = 3; * @param value the effectEventIdList to add * @return this */ @@ -324,7 +324,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } /** - * repeated uint32 effect_event_id_list = 1; + * repeated uint32 effect_event_id_list = 3; * @param values the effectEventIdList to add * @return this */ @@ -340,8 +340,8 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; optionId = other.optionId; + retcode = other.retcode; eventUniqueId = other.eventUniqueId; eventHasEffect = other.eventHasEffect; dialogueData.copyFrom(other.dialogueData); @@ -357,12 +357,12 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasOptionId()) { setOptionId(other.optionId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasEventUniqueId()) { setEventUniqueId(other.eventUniqueId); } @@ -385,8 +385,8 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; optionId = 0; + retcode = 0; eventUniqueId = 0; eventHasEffect = false; dialogueData.clear(); @@ -416,8 +416,8 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } SelectRogueCommonDialogueOptionScRsp other = (SelectRogueCommonDialogueOptionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasOptionId() || optionId == other.optionId) + && (!hasRetcode() || retcode == other.retcode) && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId) && (!hasEventHasEffect() || eventHasEffect == other.eventHasEffect) && (!hasDialogueData() || dialogueData.equals(other.dialogueData)) @@ -428,27 +428,27 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { 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) 80); output.writeUInt32NoTag(optionId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(eventUniqueId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeBoolNoTag(eventHasEffect); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 82); output.writeMessageNoTag(dialogueData); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < effectEventIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(effectEventIdList.array()[i]); } } @@ -458,10 +458,10 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(optionId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(optionId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId); @@ -487,51 +487,51 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { while (true) { switch (tag) { case 16: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { // optionId optionId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // eventUniqueId - eventUniqueId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 64) { break; } } case 64: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // eventUniqueId + eventUniqueId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { // eventHasEffect eventHasEffect = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 34) { + if (tag != 82) { break; } } - case 34: { + case 82: { // dialogueData input.readMessage(dialogueData); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 10) { + if (tag != 26) { break; } } - case 10: { + case 26: { // effectEventIdList [packed=true] input.readPackedUInt32(effectEventIdList, tag); bitField0_ |= 0x00000020; @@ -550,7 +550,7 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { tag = input.readTag(); break; } - case 8: { + case 24: { // effectEventIdList [packed=false] tag = input.readRepeatedUInt32(effectEventIdList, tag); bitField0_ |= 0x00000020; @@ -564,10 +564,10 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.optionId, optionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.optionId, optionId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId); @@ -592,10 +592,11 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -79017872: + case 1845434661: { + if (input.isAtField(FieldNames.optionId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + optionId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -603,11 +604,10 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { } break; } - case -79017872: - case 1845434661: { - if (input.isAtField(FieldNames.optionId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - optionId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -718,10 +718,10 @@ public final class SelectRogueCommonDialogueOptionScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName optionId = FieldName.forField("optionId", "option_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id"); static final FieldName eventHasEffect = FieldName.forField("eventHasEffect", "event_has_effect"); diff --git a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java index 4896fa1..3d7341e 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 = 6; + * optional bool to_material = 1; */ private boolean toMaterial; /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 5; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 6; + * optional bool to_material = 1; * @return whether the toMaterial field is set */ public boolean hasToMaterial() { @@ -47,7 +47,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 6; + * optional bool to_material = 1; * @return this */ public SellItemCsReq clearToMaterial() { @@ -57,7 +57,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 6; + * optional bool to_material = 1; * @return the toMaterial */ public boolean getToMaterial() { @@ -65,7 +65,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 6; + * optional bool to_material = 1; * @param value the toMaterial to set * @return this */ @@ -76,7 +76,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 5; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 5; * @return this */ public SellItemCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 7; + * 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. @@ -108,7 +108,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 7; + * 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 @@ -122,7 +122,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 7; + * optional .ItemCostList item_cost_list = 5; * @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) 48); + output.writeRawByte((byte) 8); output.writeBoolNoTag(toMaterial); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class SellItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 8: { // toMaterial toMaterial = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 42) { break; } } - case 58: { + case 42: { // 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 82b9b79..cb075e0 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 = 2; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 5; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return this */ public SellItemScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @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 = 5; * @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 = 5; * @return this */ public SellItemScRsp clearReturnItemList() { @@ -94,7 +94,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 5; * @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) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(returnItemList); } } @@ -226,16 +226,16 @@ public final class SellItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + case 42: { // 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 5e857ac..92d84e8 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 = 12; + * optional uint32 emote = 9; */ private int emote; /** - * optional .ChatType chat_type = 3; + * optional .ChatType chat_type = 1; */ private int chatType; /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 3; */ private int msgType; /** - * optional string text = 7; + * optional string text = 6; */ private final Utf8String text = Utf8String.newEmptyInstance(); /** - * repeated uint32 to_uid_list = 11; + * repeated uint32 to_uid_list = 15; */ private final RepeatedInt toUidList = RepeatedInt.newEmptyInstance(); @@ -56,7 +56,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 12; + * optional uint32 emote = 9; * @return whether the emote field is set */ public boolean hasEmote() { @@ -64,7 +64,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 12; + * optional uint32 emote = 9; * @return this */ public SendMsgCsReq clearEmote() { @@ -74,7 +74,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 12; + * optional uint32 emote = 9; * @return the emote */ public int getEmote() { @@ -82,7 +82,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 12; + * optional uint32 emote = 9; * @param value the emote to set * @return this */ @@ -93,7 +93,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 3; + * optional .ChatType chat_type = 1; * @return whether the chatType field is set */ public boolean hasChatType() { @@ -101,7 +101,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 3; + * optional .ChatType chat_type = 1; * @return this */ public SendMsgCsReq clearChatType() { @@ -111,7 +111,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 3; + * optional .ChatType chat_type = 1; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -144,7 +144,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 3; + * optional .ChatType chat_type = 1; * @param value the chatType to set * @return this */ @@ -155,7 +155,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 3; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -163,7 +163,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 3; * @return this */ public SendMsgCsReq clearMsgType() { @@ -173,7 +173,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 3; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -206,7 +206,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 3; * @param value the msgType to set * @return this */ @@ -217,7 +217,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 7; + * optional string text = 6; * @return whether the text field is set */ public boolean hasText() { @@ -225,7 +225,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 7; + * optional string text = 6; * @return this */ public SendMsgCsReq clearText() { @@ -235,7 +235,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 7; + * optional string text = 6; * @return the text */ public String getText() { @@ -243,7 +243,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 7; + * optional string text = 6; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -251,7 +251,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 7; + * optional string text = 6; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -260,7 +260,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 7; + * optional string text = 6; * @param value the text to set * @return this */ @@ -271,7 +271,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 7; + * optional string text = 6; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 11; + * 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 = 11; + * repeated uint32 to_uid_list = 15; * @return this */ public SendMsgCsReq clearToUidList() { @@ -300,7 +300,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 11; + * 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 = 11; + * 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 = 11; + * 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 = 11; + * repeated uint32 to_uid_list = 15; * @param values the toUidList to add * @return this */ @@ -434,24 +434,24 @@ public final class SendMsgCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 8); output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 24); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 50); output.writeStringNoTag(text); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < toUidList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(toUidList.array()[i]); } } @@ -485,16 +485,16 @@ public final class SendMsgCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 72: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 8) { break; } } - case 24: { + case 8: { // chatType final int value = input.readInt32(); if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { @@ -502,11 +502,11 @@ public final class SendMsgCsReqOuterClass { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 64) { + if (tag != 24) { break; } } - case 64: { + case 24: { // msgType final int value = input.readInt32(); if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { @@ -514,20 +514,20 @@ public final class SendMsgCsReqOuterClass { bitField0_ |= 0x00000004; } tag = input.readTag(); - if (tag != 58) { + if (tag != 50) { break; } } - case 58: { + case 50: { // text input.readString(text); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 90) { + if (tag != 122) { break; } } - case 90: { + case 122: { // toUidList [packed=true] input.readPackedUInt32(toUidList, tag); bitField0_ |= 0x00000010; @@ -546,7 +546,7 @@ public final class SendMsgCsReqOuterClass { tag = input.readTag(); break; } - case 88: { + case 120: { // toUidList [packed=false] tag = input.readRepeatedUInt32(toUidList, tag); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/ServerPrefsOuterClass.java b/src/generated/main/emu/lunarcore/proto/ServerPrefsOuterClass.java index dfaf9d3..cde44eb 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 = 12; + * optional uint32 server_prefs_id = 15; */ private int serverPrefsId; /** - * optional bytes data = 15; + * optional bytes data = 5; */ private final RepeatedByte data = RepeatedByte.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 12; + * optional uint32 server_prefs_id = 15; * @return whether the serverPrefsId field is set */ public boolean hasServerPrefsId() { @@ -48,7 +48,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 12; + * optional uint32 server_prefs_id = 15; * @return this */ public ServerPrefs clearServerPrefsId() { @@ -58,7 +58,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 12; + * optional uint32 server_prefs_id = 15; * @return the serverPrefsId */ public int getServerPrefsId() { @@ -66,7 +66,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 12; + * optional uint32 server_prefs_id = 15; * @param value the serverPrefsId to set * @return this */ @@ -77,7 +77,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 15; + * optional bytes data = 5; * @return whether the data field is set */ public boolean hasData() { @@ -85,7 +85,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 15; + * optional bytes data = 5; * @return this */ public ServerPrefs clearData() { @@ -95,7 +95,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 15; + * optional bytes data = 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 ServerPrefsOuterClass { } /** - * optional bytes data = 15; + * optional bytes data = 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 ServerPrefsOuterClass { } /** - * optional bytes data = 15; + * optional bytes data = 5; * @param value the data to add * @return this */ @@ -134,7 +134,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 15; + * optional bytes data = 5; * @param values the data to add * @return this */ @@ -145,7 +145,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 15; + * optional bytes data = 5; * @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) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(serverPrefsId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 42); output.writeBytesNoTag(data); } } @@ -249,16 +249,16 @@ public final class ServerPrefsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 120: { // serverPrefsId serverPrefsId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 42) { break; } } - case 122: { + case 42: { // 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 cfb1f41..f492817 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 = 2; + * optional uint32 avatar_id = 1; */ private int avatarId; /** - * repeated uint32 avatar_id_list = 10; + * repeated uint32 avatar_id_list = 15; */ private final RepeatedInt avatarIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 1; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -48,7 +48,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 1; * @return this */ public SetAssistAvatarCsReq clearAvatarId() { @@ -58,7 +58,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 1; * @return the avatarId */ public int getAvatarId() { @@ -66,7 +66,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 2; + * optional uint32 avatar_id = 1; * @param value the avatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 10; + * repeated uint32 avatar_id_list = 15; * @return whether the avatarIdList field is set */ public boolean hasAvatarIdList() { @@ -85,7 +85,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 10; + * repeated uint32 avatar_id_list = 15; * @return this */ public SetAssistAvatarCsReq clearAvatarIdList() { @@ -95,7 +95,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 10; + * repeated uint32 avatar_id_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 10; + * repeated uint32 avatar_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 @@ -123,7 +123,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 10; + * repeated uint32 avatar_id_list = 15; * @param value the avatarIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 10; + * repeated uint32 avatar_id_list = 15; * @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) 16); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < avatarIdList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(avatarIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class SetAssistAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 8: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 122) { break; } } - case 82: { + case 122: { // avatarIdList [packed=true] input.readPackedUInt32(avatarIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class SetAssistAvatarCsReqOuterClass { tag = input.readTag(); break; } - case 80: { + case 120: { // 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 a1e72d7..200b80a 100644 --- a/src/generated/main/emu/lunarcore/proto/SetAssistAvatarScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetAssistAvatarScRspOuterClass.java @@ -20,12 +20,12 @@ public final class SetAssistAvatarScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; */ private int avatarId; @@ -45,7 +45,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return this */ public SetAssistAvatarScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -90,7 +90,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; * @return this */ public SetAssistAvatarScRsp clearAvatarId() { @@ -100,7 +100,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; * @return the avatarId */ public int getAvatarId() { @@ -108,7 +108,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; * @param value the avatarId to set * @return this */ @@ -258,11 +258,11 @@ public final class SetAssistAvatarScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { @@ -295,16 +295,16 @@ public final class SetAssistAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 88) { break; } } - case 72: { + case 88: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetAvatarPathCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetAvatarPathCsReqOuterClass.java index 1554386..05e4fa8 100644 --- a/src/generated/main/emu/lunarcore/proto/SetAvatarPathCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetAvatarPathCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SetAvatarPathCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .MultiPathAvatarType avatar_id = 7; + * optional .MultiPathAvatarType avatar_id = 13; */ private int avatarId; @@ -34,7 +34,7 @@ public final class SetAvatarPathCsReqOuterClass { } /** - * optional .MultiPathAvatarType avatar_id = 7; + * optional .MultiPathAvatarType avatar_id = 13; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -42,7 +42,7 @@ public final class SetAvatarPathCsReqOuterClass { } /** - * optional .MultiPathAvatarType avatar_id = 7; + * optional .MultiPathAvatarType avatar_id = 13; * @return this */ public SetAvatarPathCsReq clearAvatarId() { @@ -52,7 +52,7 @@ public final class SetAvatarPathCsReqOuterClass { } /** - * optional .MultiPathAvatarType avatar_id = 7; + * optional .MultiPathAvatarType avatar_id = 13; * @return the avatarId */ public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getAvatarId() { @@ -85,7 +85,7 @@ public final class SetAvatarPathCsReqOuterClass { } /** - * optional .MultiPathAvatarType avatar_id = 7; + * optional .MultiPathAvatarType avatar_id = 13; * @param value the avatarId to set * @return this */ @@ -155,7 +155,7 @@ public final class SetAvatarPathCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeEnumNoTag(avatarId); } } @@ -176,7 +176,7 @@ public final class SetAvatarPathCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 104: { // avatarId final int value = input.readInt32(); if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SetAvatarPathScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetAvatarPathScRspOuterClass.java index 50bafe1..80266f0 100644 --- a/src/generated/main/emu/lunarcore/proto/SetAvatarPathScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetAvatarPathScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SetAvatarPathScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .MultiPathAvatarType avatar_id = 9; + * optional .MultiPathAvatarType avatar_id = 14; */ private int avatarId; @@ -39,7 +39,7 @@ public final class SetAvatarPathScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetAvatarPathScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; * @return this */ public SetAvatarPathScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetAvatarPathScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetAvatarPathScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetAvatarPathScRspOuterClass { } /** - * optional .MultiPathAvatarType avatar_id = 9; + * optional .MultiPathAvatarType avatar_id = 14; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -84,7 +84,7 @@ public final class SetAvatarPathScRspOuterClass { } /** - * optional .MultiPathAvatarType avatar_id = 9; + * optional .MultiPathAvatarType avatar_id = 14; * @return this */ public SetAvatarPathScRsp clearAvatarId() { @@ -94,7 +94,7 @@ public final class SetAvatarPathScRspOuterClass { } /** - * optional .MultiPathAvatarType avatar_id = 9; + * optional .MultiPathAvatarType avatar_id = 14; * @return the avatarId */ public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getAvatarId() { @@ -127,7 +127,7 @@ public final class SetAvatarPathScRspOuterClass { } /** - * optional .MultiPathAvatarType avatar_id = 9; + * optional .MultiPathAvatarType avatar_id = 14; * @param value the avatarId to set * @return this */ @@ -203,11 +203,11 @@ public final class SetAvatarPathScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeEnumNoTag(avatarId); } } @@ -231,16 +231,16 @@ public final class SetAvatarPathScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { + case 112: { // avatarId final int value = input.readInt32(); if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java index fc4e222..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 = 11; + * optional bool paused = 2; */ private boolean paused; @@ -34,7 +34,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 11; + * 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 = 11; + * optional bool paused = 2; * @return this */ public SetClientPausedCsReq clearPaused() { @@ -52,7 +52,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 11; + * optional bool paused = 2; * @return the paused */ public boolean getPaused() { @@ -60,7 +60,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 11; + * 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) 88); + output.writeRawByte((byte) 16); output.writeBoolNoTag(paused); } } @@ -150,7 +150,7 @@ public final class SetClientPausedCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + 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 b8f2ea8..ee93609 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 = 11; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional bool paused = 8; + * optional bool paused = 10; */ private boolean paused; @@ -39,7 +39,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @return this */ public SetClientPausedScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 8; + * optional bool paused = 10; * @return whether the paused field is set */ public boolean hasPaused() { @@ -84,7 +84,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 8; + * optional bool paused = 10; * @return this */ public SetClientPausedScRsp clearPaused() { @@ -94,7 +94,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 8; + * optional bool paused = 10; * @return the paused */ public boolean getPaused() { @@ -102,7 +102,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 8; + * optional bool paused = 10; * @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) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeBoolNoTag(paused); } } @@ -205,16 +205,16 @@ public final class SetClientPausedScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 80) { break; } } - case 64: { + case 80: { // 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 0ce668f..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 = 7; + * 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 = 7; + * 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 = 7; + * repeated .DisplayAvatar display_avatar_list = 10; * @return this */ public SetDisplayAvatarCsReq clearDisplayAvatarList() { @@ -53,7 +53,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 7; + * 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 = 7; + * 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 = 7; + * 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 = 7; + * 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) 58); + 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 58: { + 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 7c0647c..5fa23ef 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 = 3; + * optional uint32 retcode = 5; */ private int retcode; /** - * repeated .DisplayAvatar display_avatar_list = 2; + * repeated .DisplayAvatar display_avatar_list = 4; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -40,7 +40,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return this */ public SetDisplayAvatarScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 2; + * repeated .DisplayAvatar display_avatar_list = 4; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -85,7 +85,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 2; + * repeated .DisplayAvatar display_avatar_list = 4; * @return this */ public SetDisplayAvatarScRsp clearDisplayAvatarList() { @@ -95,7 +95,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 2; + * repeated .DisplayAvatar display_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. @@ -109,7 +109,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 2; + * repeated .DisplayAvatar display_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 @@ -123,7 +123,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 2; + * repeated .DisplayAvatar display_avatar_list = 4; * @param value the displayAvatarList to add * @return this */ @@ -135,7 +135,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 2; + * repeated .DisplayAvatar display_avatar_list = 4; * @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) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 34); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -242,16 +242,16 @@ public final class SetDisplayAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 34) { break; } } - case 18: { + case 34: { // displayAvatarList tag = input.readRepeatedMessage(displayAvatarList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java index 0466908..cfadda7 100644 --- a/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class SetFriendMarkCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 11; + * optional uint32 uid = 15; */ private int uid; /** - * optional bool is_set_mark = 6; + * optional bool is_set_mark = 11; */ private boolean isSetMark; @@ -39,7 +39,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 15; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 15; * @return this */ public SetFriendMarkCsReq clearUid() { @@ -57,7 +57,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 15; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional uint32 uid = 11; + * optional uint32 uid = 15; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional bool is_set_mark = 6; + * optional bool is_set_mark = 11; * @return whether the isSetMark field is set */ public boolean hasIsSetMark() { @@ -84,7 +84,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional bool is_set_mark = 6; + * optional bool is_set_mark = 11; * @return this */ public SetFriendMarkCsReq clearIsSetMark() { @@ -94,7 +94,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional bool is_set_mark = 6; + * optional bool is_set_mark = 11; * @return the isSetMark */ public boolean getIsSetMark() { @@ -102,7 +102,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional bool is_set_mark = 6; + * optional bool is_set_mark = 11; * @param value the isSetMark to set * @return this */ @@ -177,11 +177,11 @@ public final class SetFriendMarkCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeBoolNoTag(isSetMark); } } @@ -205,16 +205,16 @@ public final class SetFriendMarkCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 120: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 88) { break; } } - case 48: { + case 88: { // isSetMark isSetMark = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetFriendMarkScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetFriendMarkScRspOuterClass.java index b147768..179df39 100644 --- a/src/generated/main/emu/lunarcore/proto/SetFriendMarkScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetFriendMarkScRspOuterClass.java @@ -19,17 +19,17 @@ public final class SetFriendMarkScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; */ private int uid; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional bool is_set_mark = 8; + * optional bool is_set_mark = 10; */ private boolean isSetMark; @@ -44,7 +44,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; * @return whether the uid field is set */ public boolean hasUid() { @@ -52,7 +52,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; * @return this */ public SetFriendMarkScRsp clearUid() { @@ -62,7 +62,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; * @return the uid */ public int getUid() { @@ -70,7 +70,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; * @param value the uid to set * @return this */ @@ -81,7 +81,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; * @return this */ public SetFriendMarkScRsp clearRetcode() { @@ -99,7 +99,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional bool is_set_mark = 8; + * optional bool is_set_mark = 10; * @return whether the isSetMark field is set */ public boolean hasIsSetMark() { @@ -126,7 +126,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional bool is_set_mark = 8; + * optional bool is_set_mark = 10; * @return this */ public SetFriendMarkScRsp clearIsSetMark() { @@ -136,7 +136,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional bool is_set_mark = 8; + * optional bool is_set_mark = 10; * @return the isSetMark */ public boolean getIsSetMark() { @@ -144,7 +144,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional bool is_set_mark = 8; + * optional bool is_set_mark = 10; * @param value the isSetMark to set * @return this */ @@ -225,15 +225,15 @@ public final class SetFriendMarkScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isSetMark); } } @@ -260,25 +260,25 @@ public final class SetFriendMarkScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 112) { break; } } - case 48: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 80) { break; } } - case 64: { + case 80: { // isSetMark isSetMark = input.readBool(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayCsReqOuterClass.java index e8fc65d..9408486 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 = 13; */ private int birthday; @@ -34,7 +34,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 3; + * optional uint32 birthday = 13; * @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 = 13; * @return this */ public SetGameplayBirthdayCsReq clearBirthday() { @@ -52,7 +52,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 3; + * optional uint32 birthday = 13; * @return the birthday */ public int getBirthday() { @@ -60,7 +60,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 3; + * optional uint32 birthday = 13; * @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) 104); output.writeUInt32NoTag(birthday); } } @@ -150,7 +150,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 104: { // 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 23fa976..83eb42b 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java @@ -18,16 +18,16 @@ public final class SetGameplayBirthdayScRspOuterClass { public static final class SetGameplayBirthdayScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 retcode = 6; - */ - private int retcode; - /** * optional uint32 birthday = 11; */ private int birthday; + /** + * optional uint32 retcode = 13; + */ + private int retcode; + private SetGameplayBirthdayScRsp() { } @@ -38,49 +38,12 @@ public final class SetGameplayBirthdayScRspOuterClass { return new SetGameplayBirthdayScRsp(); } - /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 retcode = 6; - * @return this - */ - public SetGameplayBirthdayScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 6; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 6; - * @param value the retcode to set - * @return this - */ - public SetGameplayBirthdayScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - /** * optional uint32 birthday = 11; * @return whether the birthday field is set */ public boolean hasBirthday() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -88,7 +51,7 @@ public final class SetGameplayBirthdayScRspOuterClass { * @return this */ public SetGameplayBirthdayScRsp clearBirthday() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; birthday = 0; return this; } @@ -107,18 +70,55 @@ public final class SetGameplayBirthdayScRspOuterClass { * @return this */ public SetGameplayBirthdayScRsp setBirthday(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; birthday = value; return this; } + /** + * optional uint32 retcode = 13; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 13; + * @return this + */ + public SetGameplayBirthdayScRsp 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 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,30 +170,30 @@ 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) 48); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 88); output.writeUInt32NoTag(birthday); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(retcode); + } } @Override 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 48: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } case 88: { // birthday birthday = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // 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 index 97fa513..c90bd62 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataCsReqOuterClass.java @@ -20,17 +20,17 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 6; */ private int entryId; /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 11; */ private int groupId; /** - * optional string group_save_data = 6; + * optional string group_save_data = 1; */ private final Utf8String groupSaveData = Utf8String.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 6; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -53,7 +53,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 6; * @return this */ public SetGroupCustomSaveDataCsReq clearEntryId() { @@ -63,7 +63,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 6; * @return the entryId */ public int getEntryId() { @@ -71,7 +71,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 6; * @param value the entryId to set * @return this */ @@ -82,7 +82,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 11; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -90,7 +90,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 11; * @return this */ public SetGroupCustomSaveDataCsReq clearGroupId() { @@ -100,7 +100,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 11; * @return the groupId */ public int getGroupId() { @@ -108,7 +108,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 11; * @param value the groupId to set * @return this */ @@ -119,7 +119,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional string group_save_data = 6; + * optional string group_save_data = 1; * @return whether the groupSaveData field is set */ public boolean hasGroupSaveData() { @@ -127,7 +127,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional string group_save_data = 6; + * optional string group_save_data = 1; * @return this */ public SetGroupCustomSaveDataCsReq clearGroupSaveData() { @@ -137,7 +137,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional string group_save_data = 6; + * optional string group_save_data = 1; * @return the groupSaveData */ public String getGroupSaveData() { @@ -145,7 +145,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional string group_save_data = 6; + * optional string group_save_data = 1; * @return internal {@code Utf8String} representation of groupSaveData for reading */ public Utf8String getGroupSaveDataBytes() { @@ -153,7 +153,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional string group_save_data = 6; + * optional string group_save_data = 1; * @return internal {@code Utf8String} representation of groupSaveData for modifications */ public Utf8String getMutableGroupSaveDataBytes() { @@ -162,7 +162,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional string group_save_data = 6; + * optional string group_save_data = 1; * @param value the groupSaveData to set * @return this */ @@ -173,7 +173,7 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { } /** - * optional string group_save_data = 6; + * optional string group_save_data = 1; * @param value the groupSaveData to set * @return this */ @@ -255,15 +255,15 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 10); output.writeStringNoTag(groupSaveData); } } @@ -290,25 +290,25 @@ public final class SetGroupCustomSaveDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 48: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 10) { break; } } - case 50: { + case 10: { // groupSaveData input.readString(groupSaveData); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java index 693efe3..91c066d 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java @@ -19,20 +19,20 @@ public final class SetGroupCustomSaveDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 group_id = 7; + */ + private int groupId; + + /** + * optional uint32 retcode = 9; */ private int retcode; /** - * optional uint32 entry_id = 7; + * optional uint32 entry_id = 12; */ private int entryId; - /** - * optional uint32 group_id = 14; - */ - private int groupId; - private SetGroupCustomSaveDataScRsp() { } @@ -44,99 +44,25 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 group_id = 7; + * @return whether the groupId field is set */ - public boolean hasRetcode() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public SetGroupCustomSaveDataScRsp 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 SetGroupCustomSaveDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 entry_id = 7; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entry_id = 7; - * @return this - */ - public SetGroupCustomSaveDataScRsp clearEntryId() { - bitField0_ &= ~0x00000002; - 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 SetGroupCustomSaveDataScRsp setEntryId(final int value) { - bitField0_ |= 0x00000002; - entryId = value; - return this; - } - - /** - * optional uint32 group_id = 14; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 7; * @return this */ public SetGroupCustomSaveDataScRsp clearGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 7; * @return the groupId */ public int getGroupId() { @@ -144,24 +70,98 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 7; * @param value the groupId to set * @return this */ public SetGroupCustomSaveDataScRsp setGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; groupId = value; return this; } + /** + * optional uint32 retcode = 9; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 9; + * @return this + */ + public SetGroupCustomSaveDataScRsp 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 SetGroupCustomSaveDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 entry_id = 12; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entry_id = 12; + * @return this + */ + public SetGroupCustomSaveDataScRsp clearEntryId() { + bitField0_ &= ~0x00000004; + 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 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_; + groupId = other.groupId; retcode = other.retcode; entryId = other.entryId; - groupId = other.groupId; } return this; } @@ -172,15 +172,15 @@ public final class SetGroupCustomSaveDataScRspOuterClass { return this; } cachedSize = -1; + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasGroupId()) { - setGroupId(other.groupId); - } return this; } @@ -191,9 +191,9 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + groupId = 0; retcode = 0; entryId = 0; - groupId = 0; return this; } @@ -217,24 +217,24 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } SetGroupCustomSaveDataScRsp other = (SetGroupCustomSaveDataScRsp) o; return bitField0_ == other.bitField0_ + && (!hasGroupId() || groupId == other.groupId) && (!hasRetcode() || retcode == other.retcode) - && (!hasEntryId() || entryId == other.entryId) - && (!hasGroupId() || groupId == other.groupId); + && (!hasEntryId() || entryId == other.entryId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(entryId); } } @@ -242,13 +242,13 @@ public final class SetGroupCustomSaveDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } return size; } @@ -260,27 +260,27 @@ public final class SetGroupCustomSaveDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } case 56: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // groupId groupId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class SetGroupCustomSaveDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.entryId, entryId); } output.endObject(); } @@ -323,11 +323,23 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { + if (!input.trySkipNullValue()) { + groupId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 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 SetGroupCustomSaveDataScRspOuterClass { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { - if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -412,11 +412,11 @@ public final class SetGroupCustomSaveDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - - static final FieldName groupId = FieldName.forField("groupId", "group_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java index f0a935f..a149344 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 = 2; + * optional uint32 id = 1; */ private int id; @@ -34,7 +34,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 2; + * optional uint32 id = 1; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 2; + * optional uint32 id = 1; * @return this */ public SetHeadIconCsReq clearId() { @@ -52,7 +52,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 2; + * optional uint32 id = 1; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 2; + * optional uint32 id = 1; * @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) 16); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class SetHeadIconCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 8: { // 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 0f6e291..78cf511 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SetHeadIconScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 9; */ private int currentHeadIconId; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 14; */ private int retcode; @@ -39,7 +39,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 9; * @return whether the currentHeadIconId field is set */ public boolean hasCurrentHeadIconId() { @@ -47,7 +47,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 9; * @return this */ public SetHeadIconScRsp clearCurrentHeadIconId() { @@ -57,7 +57,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 9; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -65,7 +65,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 9; * @param value the currentHeadIconId to set * @return this */ @@ -76,7 +76,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 14; * @return this */ public SetHeadIconScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class SetHeadIconScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class SetHeadIconScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 72: { // currentHeadIconId currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java index 4171cf2..a5e6be6 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 = 9; + * optional uint32 index = 11; */ private int index; /** - * optional string name = 2; + * optional string name = 9; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 11; * @return whether the index field is set */ public boolean hasIndex() { @@ -48,7 +48,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 11; * @return this */ public SetLineupNameCsReq clearIndex() { @@ -58,7 +58,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 11; * @return the index */ public int getIndex() { @@ -66,7 +66,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 11; * @param value the index to set * @return this */ @@ -77,7 +77,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 2; + * optional string name = 9; * @return whether the name field is set */ public boolean hasName() { @@ -85,7 +85,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 2; + * optional string name = 9; * @return this */ public SetLineupNameCsReq clearName() { @@ -95,7 +95,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 2; + * optional string name = 9; * @return the name */ public String getName() { @@ -103,7 +103,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 2; + * optional string name = 9; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -111,7 +111,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 2; + * optional string name = 9; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -120,7 +120,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 2; + * optional string name = 9; * @param value the name to set * @return this */ @@ -131,7 +131,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 2; + * optional string name = 9; * @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) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 74); output.writeStringNoTag(name); } } @@ -235,16 +235,16 @@ public final class SetLineupNameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 88: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 74) { break; } } - case 18: { + case 74: { // 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 867a394..1816456 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 = 5; - */ - private int retcode; - - /** - * optional uint32 index = 9; + * optional uint32 index = 7; */ private int index; /** - * optional string name = 8; + * optional uint32 retcode = 12; + */ + private int retcode; + + /** + * optional string name = 5; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -45,62 +45,25 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 index = 7; + * @return whether the index field is set */ - public boolean hasRetcode() { + public boolean hasIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public SetLineupNameScRsp 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 SetLineupNameScRsp setRetcode(final int value) { - 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; + * optional uint32 index = 7; * @return this */ public SetLineupNameScRsp clearIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; index = 0; return this; } /** - * optional uint32 index = 9; + * optional uint32 index = 7; * @return the index */ public int getIndex() { @@ -108,18 +71,55 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 7; * @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 = 8; + * 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 SetLineupNameScRsp 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 SetLineupNameScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional string name = 5; * @return whether the name field is set */ public boolean hasName() { @@ -127,7 +127,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 8; + * optional string name = 5; * @return this */ public SetLineupNameScRsp clearName() { @@ -137,7 +137,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 8; + * optional string name = 5; * @return the name */ public String getName() { @@ -145,7 +145,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 8; + * optional string name = 5; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -153,7 +153,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 8; + * optional string name = 5; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -162,7 +162,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 8; + * optional string name = 5; * @param value the name to set * @return this */ @@ -173,7 +173,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 8; + * optional string name = 5; * @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) 40); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(index); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 42); 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 40: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 56: { // index index = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 96) { break; } } - case 66: { + case 96: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // 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 7b2a1f9..1348677 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 = 15; + * optional string nickname = 2; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -43,7 +43,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return this */ public SetNicknameCsReq clearNickname() { @@ -53,7 +53,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return the nickname */ public String getNickname() { @@ -61,7 +61,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -69,7 +69,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -78,7 +78,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @param value the nickname to set * @return this */ @@ -89,7 +89,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @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) 122); + output.writeRawByte((byte) 18); output.writeStringNoTag(nickname); } } @@ -180,7 +180,7 @@ public final class SetNicknameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 18: { // 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 7d70254..a3fcfb1 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 = 14; + * optional string signature = 13; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 14; + * optional string signature = 13; * @return whether the signature field is set */ public boolean hasSignature() { @@ -43,7 +43,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 14; + * optional string signature = 13; * @return this */ public SetSignatureCsReq clearSignature() { @@ -53,7 +53,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 14; + * optional string signature = 13; * @return the signature */ public String getSignature() { @@ -61,7 +61,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 14; + * optional string signature = 13; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -69,7 +69,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 14; + * optional string signature = 13; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -78,7 +78,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 14; + * optional string signature = 13; * @param value the signature to set * @return this */ @@ -89,7 +89,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 14; + * optional string signature = 13; * @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) 114); + output.writeRawByte((byte) 106); output.writeStringNoTag(signature); } } @@ -180,7 +180,7 @@ public final class SetSignatureCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 106: { // 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 a2fffcb..520172d 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 = 10; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional string signature = 7; + * optional string signature = 10; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return this */ public SetSignatureScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 7; + * optional string signature = 10; * @return whether the signature field is set */ public boolean hasSignature() { @@ -85,7 +85,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 7; + * optional string signature = 10; * @return this */ public SetSignatureScRsp clearSignature() { @@ -95,7 +95,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 7; + * optional string signature = 10; * @return the signature */ public String getSignature() { @@ -103,7 +103,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 7; + * optional string signature = 10; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -111,7 +111,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 7; + * optional string signature = 10; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -120,7 +120,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 7; + * optional string signature = 10; * @param value the signature to set * @return this */ @@ -131,7 +131,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 7; + * optional string signature = 10; * @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) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 82); output.writeStringNoTag(signature); } } @@ -235,16 +235,16 @@ public final class SetSignatureScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 82) { break; } } - case 58: { + case 82: { // 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 2697692..611af7e 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 = 6; + * optional int64 begin_time = 3; */ private long beginTime; /** - * optional int64 end_time = 15; + * optional int64 end_time = 8; */ private long endTime; /** - * optional uint64 city_taken_level_reward = 2; + * optional uint64 city_taken_level_reward = 14; */ private long cityTakenLevelReward; /** - * optional uint32 city_level = 5; - */ - private int cityLevel; - - /** - * optional uint32 city_exp = 7; - */ - private int cityExp; - - /** - * optional uint32 shop_id = 14; + * optional uint32 shop_id = 1; */ private int shopId; /** - * repeated .Goods goods_list = 8; + * optional uint32 city_exp = 6; + */ + private int cityExp; + + /** + * optional uint32 city_level = 10; + */ + private int cityLevel; + + /** + * repeated .Goods goods_list = 5; */ private final RepeatedMessage goodsList = RepeatedMessage.newEmptyInstance(GoodsOuterClass.Goods.getFactory()); @@ -65,7 +65,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 3; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -73,7 +73,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 3; * @return this */ public Shop clearBeginTime() { @@ -83,7 +83,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 3; * @return the beginTime */ public long getBeginTime() { @@ -91,7 +91,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 3; * @param value the beginTime to set * @return this */ @@ -102,7 +102,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 8; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -110,7 +110,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 8; * @return this */ public Shop clearEndTime() { @@ -120,7 +120,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 8; * @return the endTime */ public long getEndTime() { @@ -128,7 +128,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 8; * @param value the endTime to set * @return this */ @@ -139,7 +139,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 2; + * optional uint64 city_taken_level_reward = 14; * @return whether the cityTakenLevelReward field is set */ public boolean hasCityTakenLevelReward() { @@ -147,7 +147,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 2; + * optional uint64 city_taken_level_reward = 14; * @return this */ public Shop clearCityTakenLevelReward() { @@ -157,7 +157,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 2; + * optional uint64 city_taken_level_reward = 14; * @return the cityTakenLevelReward */ public long getCityTakenLevelReward() { @@ -165,7 +165,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 2; + * optional uint64 city_taken_level_reward = 14; * @param value the cityTakenLevelReward to set * @return this */ @@ -176,44 +176,44 @@ public final class ShopOuterClass { } /** - * optional uint32 city_level = 5; - * @return whether the cityLevel field is set + * optional uint32 shop_id = 1; + * @return whether the shopId field is set */ - public boolean hasCityLevel() { + public boolean hasShopId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 city_level = 5; + * optional uint32 shop_id = 1; * @return this */ - public Shop clearCityLevel() { + public Shop clearShopId() { bitField0_ &= ~0x00000008; - cityLevel = 0; + shopId = 0; return this; } /** - * optional uint32 city_level = 5; - * @return the cityLevel + * optional uint32 shop_id = 1; + * @return the shopId */ - public int getCityLevel() { - return cityLevel; + public int getShopId() { + return shopId; } /** - * optional uint32 city_level = 5; - * @param value the cityLevel to set + * optional uint32 shop_id = 1; + * @param value the shopId to set * @return this */ - public Shop setCityLevel(final int value) { + public Shop setShopId(final int value) { bitField0_ |= 0x00000008; - cityLevel = value; + shopId = value; return this; } /** - * optional uint32 city_exp = 7; + * optional uint32 city_exp = 6; * @return whether the cityExp field is set */ public boolean hasCityExp() { @@ -221,7 +221,7 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 7; + * optional uint32 city_exp = 6; * @return this */ public Shop clearCityExp() { @@ -231,7 +231,7 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 7; + * optional uint32 city_exp = 6; * @return the cityExp */ public int getCityExp() { @@ -239,7 +239,7 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 7; + * optional uint32 city_exp = 6; * @param value the cityExp to set * @return this */ @@ -250,44 +250,44 @@ public final class ShopOuterClass { } /** - * optional uint32 shop_id = 14; - * @return whether the shopId field is set + * optional uint32 city_level = 10; + * @return whether the cityLevel field is set */ - public boolean hasShopId() { + public boolean hasCityLevel() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 shop_id = 14; + * optional uint32 city_level = 10; * @return this */ - public Shop clearShopId() { + public Shop clearCityLevel() { bitField0_ &= ~0x00000020; - shopId = 0; + cityLevel = 0; return this; } /** - * optional uint32 shop_id = 14; - * @return the shopId + * optional uint32 city_level = 10; + * @return the cityLevel */ - public int getShopId() { - return shopId; + public int getCityLevel() { + return cityLevel; } /** - * optional uint32 shop_id = 14; - * @param value the shopId to set + * optional uint32 city_level = 10; + * @param value the cityLevel to set * @return this */ - public Shop setShopId(final int value) { + public Shop setCityLevel(final int value) { bitField0_ |= 0x00000020; - shopId = value; + cityLevel = value; return this; } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_list = 5; * @return whether the goodsList field is set */ public boolean hasGoodsList() { @@ -295,7 +295,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_list = 5; * @return this */ public Shop clearGoodsList() { @@ -305,7 +305,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_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. @@ -319,7 +319,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_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 @@ -333,7 +333,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_list = 5; * @param value the goodsList to add * @return this */ @@ -344,7 +344,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_list = 5; * @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; - cityLevel = other.cityLevel; - cityExp = other.cityExp; shopId = other.shopId; + cityExp = other.cityExp; + cityLevel = other.cityLevel; goodsList.copyFrom(other.goodsList); } return this; @@ -385,14 +385,14 @@ public final class ShopOuterClass { if (other.hasCityTakenLevelReward()) { setCityTakenLevelReward(other.cityTakenLevelReward); } - if (other.hasCityLevel()) { - setCityLevel(other.cityLevel); + if (other.hasShopId()) { + setShopId(other.shopId); } if (other.hasCityExp()) { setCityExp(other.cityExp); } - if (other.hasShopId()) { - setShopId(other.shopId); + if (other.hasCityLevel()) { + setCityLevel(other.cityLevel); } if (other.hasGoodsList()) { getMutableGoodsList().addAll(other.goodsList); @@ -410,9 +410,9 @@ public final class ShopOuterClass { beginTime = 0L; endTime = 0L; cityTakenLevelReward = 0L; - cityLevel = 0; - cityExp = 0; shopId = 0; + cityExp = 0; + cityLevel = 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) - && (!hasCityLevel() || cityLevel == other.cityLevel) - && (!hasCityExp() || cityExp == other.cityExp) && (!hasShopId() || shopId == other.shopId) + && (!hasCityExp() || cityExp == other.cityExp) + && (!hasCityLevel() || cityLevel == other.cityLevel) && (!hasGoodsList() || goodsList.equals(other.goodsList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 24); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 64); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeUInt64NoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(cityLevel); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(cityExp); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(shopId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(cityLevel); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < goodsList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 42); output.writeMessageNoTag(goodsList.get(i)); } } @@ -494,13 +494,13 @@ public final class ShopOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); } 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 48: { + case 24: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { + case 64: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // cityTakenLevelReward - cityTakenLevelReward = input.readUInt64(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // cityLevel - cityLevel = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // cityExp - cityExp = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 112) { break; } } case 112: { - // shopId - shopId = input.readUInt32(); - bitField0_ |= 0x00000020; + // cityTakenLevelReward + cityTakenLevelReward = input.readUInt64(); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 8) { break; } } - case 66: { + case 8: { + // shopId + shopId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // cityExp + cityExp = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // cityLevel + cityLevel = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // goodsList tag = input.readRepeatedMessage(goodsList, tag); bitField0_ |= 0x00000040; @@ -604,13 +604,13 @@ public final class ShopOuterClass { output.writeUInt64(FieldNames.cityTakenLevelReward, cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.cityLevel, cityLevel); + output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.cityExp, cityExp); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); + output.writeUInt32(FieldNames.cityLevel, cityLevel); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.goodsList, goodsList); @@ -661,11 +661,11 @@ public final class ShopOuterClass { } break; } - case -1124188967: - case 59808688: { - if (input.isAtField(FieldNames.cityLevel)) { + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { if (!input.trySkipNullValue()) { - cityLevel = input.readUInt32(); + shopId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -685,11 +685,11 @@ public final class ShopOuterClass { } break; } - case -903151951: - case 2067081988: { - if (input.isAtField(FieldNames.shopId)) { + case -1124188967: + case 59808688: { + if (input.isAtField(FieldNames.cityLevel)) { if (!input.trySkipNullValue()) { - shopId = input.readUInt32(); + cityLevel = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -767,11 +767,11 @@ public final class ShopOuterClass { static final FieldName cityTakenLevelReward = FieldName.forField("cityTakenLevelReward", "city_taken_level_reward"); - static final FieldName cityLevel = FieldName.forField("cityLevel", "city_level"); + static final FieldName shopId = FieldName.forField("shopId", "shop_id"); static final FieldName cityExp = FieldName.forField("cityExp", "city_exp"); - static final FieldName shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName cityLevel = FieldName.forField("cityLevel", "city_level"); 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 75adb28..3053839 100644 --- a/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java @@ -21,42 +21,42 @@ public final class SimpleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 last_active_time = 10; + * optional int64 last_active_time = 11; */ private long lastActiveTime; /** - * optional uint32 chat_bubble_id = 2; + * optional uint32 chat_bubble_id = 5; */ private int chatBubbleId; /** - * optional uint32 uid = 3; - */ - private int uid; - - /** - * optional uint32 level = 8; - */ - private int level; - - /** - * optional uint32 head_icon = 9; + * optional uint32 head_icon = 8; */ private int headIcon; /** - * optional .FriendOnlineStatus online_status = 7; + * optional uint32 level = 12; */ - private int onlineStatus; + private int level; /** - * optional .PlatformType platform_type = 15; + * optional uint32 uid = 15; + */ + private int uid; + + /** + * optional .PlatformType platform_type = 3; */ private int platformType; /** - * optional bool is_banned = 5; + * optional .FriendOnlineStatus online_status = 14; + */ + private int onlineStatus; + + /** + * optional bool is_banned = 4; */ private boolean isBanned; @@ -66,7 +66,7 @@ public final class SimpleInfoOuterClass { private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * optional string nickname = 13; + * optional string nickname = 7; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); @@ -86,7 +86,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 10; + * optional int64 last_active_time = 11; * @return whether the lastActiveTime field is set */ public boolean hasLastActiveTime() { @@ -94,7 +94,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 10; + * optional int64 last_active_time = 11; * @return this */ public SimpleInfo clearLastActiveTime() { @@ -104,7 +104,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 10; + * optional int64 last_active_time = 11; * @return the lastActiveTime */ public long getLastActiveTime() { @@ -112,7 +112,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 10; + * optional int64 last_active_time = 11; * @param value the lastActiveTime to set * @return this */ @@ -123,7 +123,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 2; + * optional uint32 chat_bubble_id = 5; * @return whether the chatBubbleId field is set */ public boolean hasChatBubbleId() { @@ -131,7 +131,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 2; + * optional uint32 chat_bubble_id = 5; * @return this */ public SimpleInfo clearChatBubbleId() { @@ -141,7 +141,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 2; + * optional uint32 chat_bubble_id = 5; * @return the chatBubbleId */ public int getChatBubbleId() { @@ -149,7 +149,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 2; + * optional uint32 chat_bubble_id = 5; * @param value the chatBubbleId to set * @return this */ @@ -160,44 +160,44 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 uid = 3; - * @return whether the uid field is set + * optional uint32 head_icon = 8; + * @return whether the headIcon field is set */ - public boolean hasUid() { + public boolean hasHeadIcon() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 uid = 3; + * optional uint32 head_icon = 8; * @return this */ - public SimpleInfo clearUid() { + public SimpleInfo clearHeadIcon() { bitField0_ &= ~0x00000004; - uid = 0; + headIcon = 0; return this; } /** - * optional uint32 uid = 3; - * @return the uid + * optional uint32 head_icon = 8; + * @return the headIcon */ - public int getUid() { - return uid; + public int getHeadIcon() { + return headIcon; } /** - * optional uint32 uid = 3; - * @param value the uid to set + * optional uint32 head_icon = 8; + * @param value the headIcon to set * @return this */ - public SimpleInfo setUid(final int value) { + public SimpleInfo setHeadIcon(final int value) { bitField0_ |= 0x00000004; - uid = value; + headIcon = value; return this; } /** - * optional uint32 level = 8; + * optional uint32 level = 12; * @return whether the level field is set */ public boolean hasLevel() { @@ -205,7 +205,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 12; * @return this */ public SimpleInfo clearLevel() { @@ -215,7 +215,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 12; * @return the level */ public int getLevel() { @@ -223,7 +223,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 12; * @param value the level to set * @return this */ @@ -234,124 +234,62 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 head_icon = 9; - * @return whether the headIcon field is set + * optional uint32 uid = 15; + * @return whether the uid field is set */ - public boolean hasHeadIcon() { + public boolean hasUid() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 head_icon = 9; + * optional uint32 uid = 15; * @return this */ - public SimpleInfo clearHeadIcon() { + public SimpleInfo clearUid() { bitField0_ &= ~0x00000010; - headIcon = 0; + uid = 0; return this; } /** - * optional uint32 head_icon = 9; - * @return the headIcon + * optional uint32 uid = 15; + * @return the uid */ - public int getHeadIcon() { - return headIcon; + public int getUid() { + return uid; } /** - * optional uint32 head_icon = 9; - * @param value the headIcon to set + * optional uint32 uid = 15; + * @param value the uid to set * @return this */ - public SimpleInfo setHeadIcon(final int value) { + public SimpleInfo setUid(final int value) { bitField0_ |= 0x00000010; - headIcon = value; + uid = value; return this; } /** - * optional .FriendOnlineStatus online_status = 7; - * @return whether the onlineStatus field is set + * optional .PlatformType platform_type = 3; + * @return whether the platformType field is set */ - public boolean hasOnlineStatus() { + public boolean hasPlatformType() { return (bitField0_ & 0x00000020) != 0; } /** - * optional .FriendOnlineStatus online_status = 7; - * @return this - */ - public SimpleInfo clearOnlineStatus() { - bitField0_ &= ~0x00000020; - onlineStatus = 0; - return this; - } - - /** - * optional .FriendOnlineStatus online_status = 7; - * @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 = 7; - * @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 = 15; - * @return whether the platformType field is set - */ - public boolean hasPlatformType() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 3; * @return this */ public SimpleInfo clearPlatformType() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; platformType = 0; return this; } /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 3; * @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 = 15; + * optional .PlatformType platform_type = 3; * @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 = 5; + * optional .FriendOnlineStatus online_status = 14; + * @return whether the onlineStatus field is set + */ + public boolean hasOnlineStatus() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional .FriendOnlineStatus online_status = 14; + * @return this + */ + public SimpleInfo clearOnlineStatus() { + bitField0_ &= ~0x00000040; + onlineStatus = 0; + return this; + } + + /** + * optional .FriendOnlineStatus online_status = 14; + * @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 = 14; + * @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 = 4; * @return whether the isBanned field is set */ public boolean hasIsBanned() { @@ -403,7 +403,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 5; + * optional bool is_banned = 4; * @return this */ public SimpleInfo clearIsBanned() { @@ -413,7 +413,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 5; + * optional bool is_banned = 4; * @return the isBanned */ public boolean getIsBanned() { @@ -421,7 +421,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 5; + * optional bool is_banned = 4; * @param value the isBanned to set * @return this */ @@ -497,7 +497,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 7; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -505,7 +505,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 7; * @return this */ public SimpleInfo clearNickname() { @@ -515,7 +515,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 7; * @return the nickname */ public String getNickname() { @@ -523,7 +523,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 7; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -531,7 +531,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 7; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -540,7 +540,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 7; * @param value the nickname to set * @return this */ @@ -551,7 +551,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 7; * @param value the nickname to set * @return this */ @@ -638,11 +638,11 @@ public final class SimpleInfoOuterClass { bitField0_ = other.bitField0_; lastActiveTime = other.lastActiveTime; chatBubbleId = other.chatBubbleId; - uid = other.uid; - level = other.level; headIcon = other.headIcon; - onlineStatus = other.onlineStatus; + level = other.level; + uid = other.uid; platformType = other.platformType; + onlineStatus = other.onlineStatus; isBanned = other.isBanned; signature.copyFrom(other.signature); nickname.copyFrom(other.nickname); @@ -663,21 +663,21 @@ 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.hasHeadIcon()) { - setHeadIcon(other.headIcon); - } - if (other.hasOnlineStatus()) { - setOnlineStatusValue(other.onlineStatus); + if (other.hasUid()) { + setUid(other.uid); } if (other.hasPlatformType()) { setPlatformTypeValue(other.platformType); } + if (other.hasOnlineStatus()) { + setOnlineStatusValue(other.onlineStatus); + } if (other.hasIsBanned()) { setIsBanned(other.isBanned); } @@ -702,11 +702,11 @@ public final class SimpleInfoOuterClass { bitField0_ = 0; lastActiveTime = 0L; chatBubbleId = 0; - uid = 0; - level = 0; headIcon = 0; - onlineStatus = 0; + level = 0; + uid = 0; platformType = 0; + onlineStatus = 0; isBanned = false; signature.clear(); nickname.clear(); @@ -739,11 +739,11 @@ public final class SimpleInfoOuterClass { return bitField0_ == other.bitField0_ && (!hasLastActiveTime() || lastActiveTime == other.lastActiveTime) && (!hasChatBubbleId() || chatBubbleId == other.chatBubbleId) - && (!hasUid() || uid == other.uid) - && (!hasLevel() || level == other.level) && (!hasHeadIcon() || headIcon == other.headIcon) - && (!hasOnlineStatus() || onlineStatus == other.onlineStatus) + && (!hasLevel() || level == other.level) + && (!hasUid() || uid == other.uid) && (!hasPlatformType() || platformType == other.platformType) + && (!hasOnlineStatus() || onlineStatus == other.onlineStatus) && (!hasIsBanned() || isBanned == other.isBanned) && (!hasSignature() || signature.equals(other.signature)) && (!hasNickname() || nickname.equals(other.nickname)) @@ -753,35 +753,35 @@ public final class SimpleInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeInt64NoTag(lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(chatBubbleId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(uid); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(headIcon); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(headIcon); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 56); - output.writeEnumNoTag(onlineStatus); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeEnumNoTag(platformType); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 112); + output.writeEnumNoTag(onlineStatus); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isBanned); } if ((bitField0_ & 0x00000100) != 0) { @@ -789,7 +789,7 @@ public final class SimpleInfoOuterClass { output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 58); output.writeStringNoTag(nickname); } if ((bitField0_ & 0x00000400) != 0) { @@ -810,19 +810,19 @@ public final class SimpleInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(chatBubbleId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } 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; @@ -846,76 +846,76 @@ public final class SimpleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 88: { // lastActiveTime lastActiveTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // chatBubbleId - chatBubbleId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // uid - uid = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // headIcon - headIcon = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // onlineStatus - final int value = input.readInt32(); - if (FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(value) != null) { - onlineStatus = value; - bitField0_ |= 0x00000020; - } - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // platformType - final int value = input.readInt32(); - if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { - platformType = value; - bitField0_ |= 0x00000040; - } - tag = input.readTag(); if (tag != 40) { break; } } case 40: { + // chatBubbleId + chatBubbleId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // headIcon + headIcon = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // uid + uid = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // platformType + final int value = input.readInt32(); + if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { + platformType = value; + bitField0_ |= 0x00000020; + } + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // onlineStatus + final int value = input.readInt32(); + if (FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(value) != null) { + onlineStatus = value; + bitField0_ |= 0x00000040; + } + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { // isBanned isBanned = input.readBool(); bitField0_ |= 0x00000080; @@ -929,11 +929,11 @@ public final class SimpleInfoOuterClass { input.readString(signature); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 106) { + if (tag != 58) { break; } } - case 106: { + case 58: { // nickname input.readString(nickname); bitField0_ |= 0x00000200; @@ -974,19 +974,19 @@ public final class SimpleInfoOuterClass { output.writeUInt32(FieldNames.chatBubbleId, chatBubbleId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.headIcon, headIcon); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.headIcon, headIcon); + output.writeUInt32(FieldNames.uid, uid); } 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); @@ -1034,10 +1034,11 @@ public final class SimpleInfoOuterClass { } break; } - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case -1116107143: + case -219098248: { + if (input.isAtField(FieldNames.headIcon)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + headIcon = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1056,11 +1057,10 @@ public final class SimpleInfoOuterClass { } break; } - case -1116107143: - case -219098248: { - if (input.isAtField(FieldNames.headIcon)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - headIcon = input.readUInt32(); + 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(); @@ -1204,16 +1204,16 @@ 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 headIcon = FieldName.forField("headIcon", "head_icon"); - - static final FieldName onlineStatus = FieldName.forField("onlineStatus", "online_status"); + 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 isBanned = FieldName.forField("isBanned", "is_banned"); static final FieldName signature = FieldName.forField("signature"); diff --git a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java index 5cfae6d..c77fbf9 100644 --- a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java @@ -19,25 +19,25 @@ public final class StaminaInfoScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 5; */ private long nextRecoverTime; /** - * optional int64 next_reserve_time = 14; + * optional int64 next_reserve_time = 7; */ private long nextReserveTime; /** - * optional uint32 stamina = 2; - */ - private int stamina; - - /** - * optional uint32 reserve_stamina = 12; + * optional uint32 reserve_stamina = 2; */ private int reserveStamina; + /** + * optional uint32 stamina = 13; + */ + private int stamina; + private StaminaInfoScNotify() { } @@ -49,7 +49,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 5; * @return whether the nextRecoverTime field is set */ public boolean hasNextRecoverTime() { @@ -57,7 +57,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 5; * @return this */ public StaminaInfoScNotify clearNextRecoverTime() { @@ -67,7 +67,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 5; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -75,7 +75,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 5; * @param value the nextRecoverTime to set * @return this */ @@ -86,7 +86,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_reserve_time = 14; + * optional int64 next_reserve_time = 7; * @return whether the nextReserveTime field is set */ public boolean hasNextReserveTime() { @@ -94,7 +94,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_reserve_time = 14; + * optional int64 next_reserve_time = 7; * @return this */ public StaminaInfoScNotify clearNextReserveTime() { @@ -104,7 +104,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_reserve_time = 14; + * optional int64 next_reserve_time = 7; * @return the nextReserveTime */ public long getNextReserveTime() { @@ -112,7 +112,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_reserve_time = 14; + * optional int64 next_reserve_time = 7; * @param value the nextReserveTime to set * @return this */ @@ -123,62 +123,25 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 2; - * @return whether the stamina field is set + * optional uint32 reserve_stamina = 2; + * @return whether the reserveStamina field is set */ - public boolean hasStamina() { + public boolean hasReserveStamina() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 stamina = 2; - * @return this - */ - public StaminaInfoScNotify clearStamina() { - bitField0_ &= ~0x00000004; - stamina = 0; - return this; - } - - /** - * optional uint32 stamina = 2; - * @return the stamina - */ - public int getStamina() { - return stamina; - } - - /** - * optional uint32 stamina = 2; - * @param value the stamina to set - * @return this - */ - public StaminaInfoScNotify setStamina(final int value) { - bitField0_ |= 0x00000004; - stamina = value; - return this; - } - - /** - * optional uint32 reserve_stamina = 12; - * @return whether the reserveStamina field is set - */ - public boolean hasReserveStamina() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 reserve_stamina = 12; + * optional uint32 reserve_stamina = 2; * @return this */ public StaminaInfoScNotify clearReserveStamina() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; reserveStamina = 0; return this; } /** - * optional uint32 reserve_stamina = 12; + * optional uint32 reserve_stamina = 2; * @return the reserveStamina */ public int getReserveStamina() { @@ -186,16 +149,53 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 12; + * optional uint32 reserve_stamina = 2; * @param value the reserveStamina to set * @return this */ public StaminaInfoScNotify setReserveStamina(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; reserveStamina = value; return this; } + /** + * optional uint32 stamina = 13; + * @return whether the stamina field is set + */ + public boolean hasStamina() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 stamina = 13; + * @return this + */ + public StaminaInfoScNotify clearStamina() { + bitField0_ &= ~0x00000008; + stamina = 0; + return this; + } + + /** + * optional uint32 stamina = 13; + * @return the stamina + */ + public int getStamina() { + return stamina; + } + + /** + * optional uint32 stamina = 13; + * @param value the stamina to set + * @return this + */ + public StaminaInfoScNotify setStamina(final int value) { + bitField0_ |= 0x00000008; + stamina = value; + return this; + } + @Override public StaminaInfoScNotify copyFrom(final StaminaInfoScNotify other) { cachedSize = other.cachedSize; @@ -203,8 +203,8 @@ public final class StaminaInfoScNotifyOuterClass { bitField0_ = other.bitField0_; nextRecoverTime = other.nextRecoverTime; nextReserveTime = other.nextReserveTime; - stamina = other.stamina; reserveStamina = other.reserveStamina; + stamina = other.stamina; } return this; } @@ -221,12 +221,12 @@ public final class StaminaInfoScNotifyOuterClass { if (other.hasNextReserveTime()) { setNextReserveTime(other.nextReserveTime); } - if (other.hasStamina()) { - setStamina(other.stamina); - } if (other.hasReserveStamina()) { setReserveStamina(other.reserveStamina); } + if (other.hasStamina()) { + setStamina(other.stamina); + } return this; } @@ -239,8 +239,8 @@ public final class StaminaInfoScNotifyOuterClass { bitField0_ = 0; nextRecoverTime = 0L; nextReserveTime = 0L; - stamina = 0; reserveStamina = 0; + stamina = 0; return this; } @@ -266,27 +266,27 @@ public final class StaminaInfoScNotifyOuterClass { return bitField0_ == other.bitField0_ && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) && (!hasNextReserveTime() || nextReserveTime == other.nextReserveTime) - && (!hasStamina() || stamina == other.stamina) - && (!hasReserveStamina() || reserveStamina == other.reserveStamina); + && (!hasReserveStamina() || reserveStamina == other.reserveStamina) + && (!hasStamina() || stamina == other.stamina); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 56); output.writeInt64NoTag(nextReserveTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(stamina); + output.writeUInt32NoTag(reserveStamina); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(reserveStamina); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(stamina); } } @@ -300,10 +300,10 @@ public final class StaminaInfoScNotifyOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(nextReserveTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); + size += 1 + ProtoSink.computeUInt32SizeNoTag(reserveStamina); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(reserveStamina); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); } return size; } @@ -315,16 +315,16 @@ public final class StaminaInfoScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 40: { // nextRecoverTime nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 56) { break; } } - case 112: { + case 56: { // nextReserveTime nextReserveTime = input.readInt64(); bitField0_ |= 0x00000002; @@ -334,17 +334,17 @@ public final class StaminaInfoScNotifyOuterClass { } } case 16: { - // stamina - stamina = input.readUInt32(); + // reserveStamina + reserveStamina = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // reserveStamina - reserveStamina = input.readUInt32(); + case 104: { + // stamina + stamina = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -375,10 +375,10 @@ public final class StaminaInfoScNotifyOuterClass { output.writeInt64(FieldNames.nextReserveTime, nextReserveTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.stamina, stamina); + output.writeUInt32(FieldNames.reserveStamina, reserveStamina); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.reserveStamina, reserveStamina); + output.writeUInt32(FieldNames.stamina, stamina); } output.endObject(); } @@ -414,10 +414,11 @@ public final class StaminaInfoScNotifyOuterClass { } break; } - case -1897344401: { - if (input.isAtField(FieldNames.stamina)) { + case -273362413: + case -799929876: { + if (input.isAtField(FieldNames.reserveStamina)) { if (!input.trySkipNullValue()) { - stamina = input.readUInt32(); + reserveStamina = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -425,11 +426,10 @@ public final class StaminaInfoScNotifyOuterClass { } break; } - case -273362413: - case -799929876: { - if (input.isAtField(FieldNames.reserveStamina)) { + case -1897344401: { + if (input.isAtField(FieldNames.stamina)) { if (!input.trySkipNullValue()) { - reserveStamina = input.readUInt32(); + stamina = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -494,9 +494,9 @@ public final class StaminaInfoScNotifyOuterClass { static final FieldName nextReserveTime = FieldName.forField("nextReserveTime", "next_reserve_time"); - static final FieldName stamina = FieldName.forField("stamina"); - static final FieldName reserveStamina = FieldName.forField("reserveStamina", "reserve_stamina"); + + 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 ea1c5d6..42c676a 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class StartChallengeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 12; */ private int challengeId; @@ -30,12 +30,12 @@ public final class StartChallengeCsReqOuterClass { private final StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo extInfo = StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo.newInstance(); /** - * repeated uint32 first_half_lineup = 5; + * repeated uint32 first_half_lineup = 6; */ private final RepeatedInt firstHalfLineup = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 second_half_lineup = 12; + * repeated uint32 second_half_lineup = 14; */ private final RepeatedInt secondHalfLineup = RepeatedInt.newEmptyInstance(); @@ -50,7 +50,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 12; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -58,7 +58,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 12; * @return this */ public StartChallengeCsReq clearChallengeId() { @@ -68,7 +68,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 12; * @return the challengeId */ public int getChallengeId() { @@ -76,7 +76,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 12; * @param value the challengeId to set * @return this */ @@ -145,7 +145,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 first_half_lineup = 5; + * repeated uint32 first_half_lineup = 6; * @return whether the firstHalfLineup field is set */ public boolean hasFirstHalfLineup() { @@ -153,7 +153,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 first_half_lineup = 5; + * repeated uint32 first_half_lineup = 6; * @return this */ public StartChallengeCsReq clearFirstHalfLineup() { @@ -163,7 +163,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 first_half_lineup = 5; + * repeated uint32 first_half_lineup = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -177,7 +177,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 first_half_lineup = 5; + * repeated uint32 first_half_lineup = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -191,7 +191,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 first_half_lineup = 5; + * repeated uint32 first_half_lineup = 6; * @param value the firstHalfLineup to add * @return this */ @@ -202,7 +202,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 first_half_lineup = 5; + * repeated uint32 first_half_lineup = 6; * @param values the firstHalfLineup to add * @return this */ @@ -213,7 +213,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 second_half_lineup = 12; + * repeated uint32 second_half_lineup = 14; * @return whether the secondHalfLineup field is set */ public boolean hasSecondHalfLineup() { @@ -221,7 +221,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 second_half_lineup = 12; + * repeated uint32 second_half_lineup = 14; * @return this */ public StartChallengeCsReq clearSecondHalfLineup() { @@ -231,7 +231,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 second_half_lineup = 12; + * repeated uint32 second_half_lineup = 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. @@ -245,7 +245,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 second_half_lineup = 12; + * repeated uint32 second_half_lineup = 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 @@ -259,7 +259,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 second_half_lineup = 12; + * repeated uint32 second_half_lineup = 14; * @param value the secondHalfLineup to add * @return this */ @@ -270,7 +270,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * repeated uint32 second_half_lineup = 12; + * repeated uint32 second_half_lineup = 14; * @param values the secondHalfLineup to add * @return this */ @@ -360,7 +360,7 @@ public final class StartChallengeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { @@ -369,13 +369,13 @@ public final class StartChallengeCsReqOuterClass { } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < firstHalfLineup.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(firstHalfLineup.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < secondHalfLineup.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(secondHalfLineup.array()[i]); } } @@ -406,7 +406,7 @@ public final class StartChallengeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 96: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000001; @@ -420,20 +420,20 @@ public final class StartChallengeCsReqOuterClass { input.readMessage(extInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 50) { break; } } - case 42: { + case 50: { // firstHalfLineup [packed=true] input.readPackedUInt32(firstHalfLineup, tag); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 114) { break; } } - case 98: { + case 114: { // secondHalfLineup [packed=true] input.readPackedUInt32(secondHalfLineup, tag); bitField0_ |= 0x00000008; @@ -452,13 +452,13 @@ public final class StartChallengeCsReqOuterClass { tag = input.readTag(); break; } - case 40: { + case 48: { // firstHalfLineup [packed=false] tag = input.readRepeatedUInt32(firstHalfLineup, tag); bitField0_ |= 0x00000004; break; } - case 96: { + case 112: { // secondHalfLineup [packed=false] tag = input.readRepeatedUInt32(secondHalfLineup, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java index d551ba3..5d45371 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java @@ -20,27 +20,27 @@ public final class StartChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; */ private int retcode; + /** + * optional .ChallengeExtInfo ext_info = 4; + */ + private final ChallengeExtInfoOuterClass.ChallengeExtInfo extInfo = ChallengeExtInfoOuterClass.ChallengeExtInfo.newInstance(); + /** * optional .ChallengeInfo challenge_info = 8; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .ChallengeExtInfo ext_info = 12; - */ - private final ChallengeExtInfoOuterClass.ChallengeExtInfo extInfo = ChallengeExtInfoOuterClass.ChallengeExtInfo.newInstance(); - - /** - * repeated .LineupInfo lineup_list = 14; + * repeated .LineupInfo lineup_list = 10; */ private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); @@ -55,7 +55,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -63,7 +63,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return this */ public StartChallengeScRsp clearRetcode() { @@ -73,7 +73,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -81,7 +81,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -91,12 +91,69 @@ public final class StartChallengeScRspOuterClass { return this; } + /** + * optional .ChallengeExtInfo ext_info = 4; + * @return whether the extInfo field is set + */ + public boolean hasExtInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .ChallengeExtInfo ext_info = 4; + * @return this + */ + public StartChallengeScRsp clearExtInfo() { + bitField0_ &= ~0x00000002; + extInfo.clear(); + return this; + } + + /** + * optional .ChallengeExtInfo ext_info = 4; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableExtInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeExtInfoOuterClass.ChallengeExtInfo getExtInfo() { + return extInfo; + } + + /** + * optional .ChallengeExtInfo ext_info = 4; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ChallengeExtInfoOuterClass.ChallengeExtInfo getMutableExtInfo() { + bitField0_ |= 0x00000002; + return extInfo; + } + + /** + * optional .ChallengeExtInfo ext_info = 4; + * @param value the extInfo to set + * @return this + */ + public StartChallengeScRsp setExtInfo(final ChallengeExtInfoOuterClass.ChallengeExtInfo value) { + bitField0_ |= 0x00000002; + extInfo.copyFrom(value); + return this; + } + /** * optional .ChallengeInfo challenge_info = 8; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -104,7 +161,7 @@ public final class StartChallengeScRspOuterClass { * @return this */ public StartChallengeScRsp clearChallengeInfo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; challengeInfo.clear(); return this; } @@ -133,7 +190,7 @@ public final class StartChallengeScRspOuterClass { * @return internal storage object for modifications */ public ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return challengeInfo; } @@ -143,31 +200,31 @@ public final class StartChallengeScRspOuterClass { * @return this */ public StartChallengeScRsp setChallengeInfo(final ChallengeInfoOuterClass.ChallengeInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; challengeInfo.copyFrom(value); return this; } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; * @return whether the scene field is set */ public boolean hasScene() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; * @return this */ public StartChallengeScRsp clearScene() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; scene.clear(); return this; } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 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. @@ -181,7 +238,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 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 @@ -190,80 +247,23 @@ public final class StartChallengeScRspOuterClass { * @return internal storage object for modifications */ public SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return scene; } /** - * optional .SceneInfo scene = 11; + * optional .SceneInfo scene = 15; * @param value the scene to set * @return this */ public StartChallengeScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; scene.copyFrom(value); return this; } /** - * optional .ChallengeExtInfo ext_info = 12; - * @return whether the extInfo field is set - */ - public boolean hasExtInfo() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .ChallengeExtInfo ext_info = 12; - * @return this - */ - public StartChallengeScRsp clearExtInfo() { - bitField0_ &= ~0x00000008; - extInfo.clear(); - return this; - } - - /** - * optional .ChallengeExtInfo ext_info = 12; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableExtInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChallengeExtInfoOuterClass.ChallengeExtInfo getExtInfo() { - return extInfo; - } - - /** - * optional .ChallengeExtInfo ext_info = 12; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ChallengeExtInfoOuterClass.ChallengeExtInfo getMutableExtInfo() { - bitField0_ |= 0x00000008; - return extInfo; - } - - /** - * optional .ChallengeExtInfo ext_info = 12; - * @param value the extInfo to set - * @return this - */ - public StartChallengeScRsp setExtInfo(final ChallengeExtInfoOuterClass.ChallengeExtInfo value) { - bitField0_ |= 0x00000008; - extInfo.copyFrom(value); - return this; - } - - /** - * repeated .LineupInfo lineup_list = 14; + * repeated .LineupInfo lineup_list = 10; * @return whether the lineupList field is set */ public boolean hasLineupList() { @@ -271,7 +271,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 14; + * repeated .LineupInfo lineup_list = 10; * @return this */ public StartChallengeScRsp clearLineupList() { @@ -281,7 +281,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 14; + * repeated .LineupInfo lineup_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. @@ -295,7 +295,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 14; + * repeated .LineupInfo lineup_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 @@ -309,7 +309,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 14; + * repeated .LineupInfo lineup_list = 10; * @param value the lineupList to add * @return this */ @@ -320,7 +320,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 14; + * repeated .LineupInfo lineup_list = 10; * @param values the lineupList to add * @return this */ @@ -336,9 +336,9 @@ public final class StartChallengeScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; + extInfo.copyFrom(other.extInfo); challengeInfo.copyFrom(other.challengeInfo); scene.copyFrom(other.scene); - extInfo.copyFrom(other.extInfo); lineupList.copyFrom(other.lineupList); } return this; @@ -353,15 +353,15 @@ public final class StartChallengeScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasExtInfo()) { + getMutableExtInfo().mergeFrom(other.extInfo); + } if (other.hasChallengeInfo()) { getMutableChallengeInfo().mergeFrom(other.challengeInfo); } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } - if (other.hasExtInfo()) { - getMutableExtInfo().mergeFrom(other.extInfo); - } if (other.hasLineupList()) { getMutableLineupList().addAll(other.lineupList); } @@ -376,9 +376,9 @@ public final class StartChallengeScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; + extInfo.clear(); challengeInfo.clear(); scene.clear(); - extInfo.clear(); lineupList.clear(); return this; } @@ -390,9 +390,9 @@ public final class StartChallengeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + extInfo.clearQuick(); challengeInfo.clearQuick(); scene.clearQuick(); - extInfo.clearQuick(); lineupList.clearQuick(); return this; } @@ -408,33 +408,33 @@ public final class StartChallengeScRspOuterClass { StartChallengeScRsp other = (StartChallengeScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) + && (!hasExtInfo() || extInfo.equals(other.extInfo)) && (!hasChallengeInfo() || challengeInfo.equals(other.challengeInfo)) && (!hasScene() || scene.equals(other.scene)) - && (!hasExtInfo() || extInfo.equals(other.extInfo)) && (!hasLineupList() || lineupList.equals(other.lineupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(extInfo); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 66); output.writeMessageNoTag(challengeInfo); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(scene); - } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(extInfo); + output.writeRawByte((byte) 122); + output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < lineupList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 82); output.writeMessageNoTag(lineupList.get(i)); } } @@ -447,13 +447,13 @@ public final class StartChallengeScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * lineupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lineupList); @@ -468,11 +468,20 @@ public final class StartChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // extInfo + input.readMessage(extInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 66) { break; } @@ -480,31 +489,22 @@ public final class StartChallengeScRspOuterClass { case 66: { // challengeInfo input.readMessage(challengeInfo); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { - // scene - input.readMessage(scene); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 122) { break; } } - case 98: { - // extInfo - input.readMessage(extInfo); + case 122: { + // scene + input.readMessage(scene); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 82) { break; } } - case 114: { + case 82: { // lineupList tag = input.readRepeatedMessage(lineupList, tag); bitField0_ |= 0x00000010; @@ -533,13 +533,13 @@ public final class StartChallengeScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.challengeInfo, challengeInfo); + output.writeMessage(FieldNames.extInfo, extInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.scene, scene); + output.writeMessage(FieldNames.challengeInfo, challengeInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.extInfo, extInfo); + output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.lineupList, lineupList); @@ -565,12 +565,24 @@ public final class StartChallengeScRspOuterClass { } break; } + case -1306498449: + case -1826570228: { + if (input.isAtField(FieldNames.extInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(extInfo); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -812487759: case 602859274: { if (input.isAtField(FieldNames.challengeInfo)) { if (!input.trySkipNullValue()) { input.readMessage(challengeInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -581,18 +593,6 @@ public final class StartChallengeScRspOuterClass { if (input.isAtField(FieldNames.scene)) { if (!input.trySkipNullValue()) { input.readMessage(scene); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1306498449: - case -1826570228: { - if (input.isAtField(FieldNames.extInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(extInfo); bitField0_ |= 0x00000008; } } else { @@ -667,12 +667,12 @@ public final class StartChallengeScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName extInfo = FieldName.forField("extInfo", "ext_info"); + static final FieldName challengeInfo = FieldName.forField("challengeInfo", "challenge_info"); static final FieldName scene = FieldName.forField("scene"); - static final FieldName extInfo = FieldName.forField("extInfo", "ext_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 30ae8ac..e06ab8c 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_one = 7; + * optional uint32 story_buff_two = 2; */ - private int storyBuffOne; + private int storyBuffTwo; /** * 
      *  ?
      *
* - * optional uint32 story_buff_two = 10; + * optional uint32 story_buff_one = 13; */ - private int storyBuffTwo; + private int storyBuffOne; private StartChallengeStoryBuffInfo() { } @@ -51,10 +51,10 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_one = 7; - * @return whether the storyBuffOne field is set + * optional uint32 story_buff_two = 2; + * @return whether the storyBuffTwo field is set */ - public boolean hasStoryBuffOne() { + public boolean hasStoryBuffTwo() { return (bitField0_ & 0x00000001) != 0; } @@ -63,64 +63,11 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_one = 7; - * @return this - */ - public StartChallengeStoryBuffInfo clearStoryBuffOne() { - bitField0_ &= ~0x00000001; - storyBuffOne = 0; - return this; - } - - /** - * 
-     *  ?
-     *
- * - * optional uint32 story_buff_one = 7; - * @return the storyBuffOne - */ - public int getStoryBuffOne() { - return storyBuffOne; - } - - /** - * 
-     *  ?
-     *
- * - * optional uint32 story_buff_one = 7; - * @param value the storyBuffOne to set - * @return this - */ - public StartChallengeStoryBuffInfo setStoryBuffOne(final int value) { - 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; + * optional uint32 story_buff_two = 2; * @return this */ public StartChallengeStoryBuffInfo clearStoryBuffTwo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; storyBuffTwo = 0; return this; } @@ -130,7 +77,7 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_two = 10; + * optional uint32 story_buff_two = 2; * @return the storyBuffTwo */ public int getStoryBuffTwo() { @@ -142,23 +89,76 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_two = 10; + * optional uint32 story_buff_two = 2; * @param value the storyBuffTwo to set * @return this */ public StartChallengeStoryBuffInfo setStoryBuffTwo(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; storyBuffTwo = value; return this; } + /** + * 
+     *  ?
+     *
+ * + * optional uint32 story_buff_one = 13; + * @return whether the storyBuffOne field is set + */ + public boolean hasStoryBuffOne() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 story_buff_one = 13; + * @return this + */ + public StartChallengeStoryBuffInfo clearStoryBuffOne() { + bitField0_ &= ~0x00000002; + storyBuffOne = 0; + return this; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 story_buff_one = 13; + * @return the storyBuffOne + */ + public int getStoryBuffOne() { + return storyBuffOne; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 story_buff_one = 13; + * @param value the storyBuffOne to set + * @return this + */ + public StartChallengeStoryBuffInfo setStoryBuffOne(final int value) { + bitField0_ |= 0x00000002; + storyBuffOne = value; + return this; + } + @Override public StartChallengeStoryBuffInfo copyFrom(final StartChallengeStoryBuffInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - storyBuffOne = other.storyBuffOne; storyBuffTwo = other.storyBuffTwo; + storyBuffOne = other.storyBuffOne; } return this; } @@ -169,12 +169,12 @@ public final class StartChallengeStoryBuffInfoOuterClass { return this; } cachedSize = -1; - if (other.hasStoryBuffOne()) { - setStoryBuffOne(other.storyBuffOne); - } if (other.hasStoryBuffTwo()) { setStoryBuffTwo(other.storyBuffTwo); } + if (other.hasStoryBuffOne()) { + setStoryBuffOne(other.storyBuffOne); + } return this; } @@ -185,8 +185,8 @@ public final class StartChallengeStoryBuffInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - storyBuffOne = 0; storyBuffTwo = 0; + storyBuffOne = 0; return this; } @@ -210,19 +210,19 @@ public final class StartChallengeStoryBuffInfoOuterClass { } StartChallengeStoryBuffInfo other = (StartChallengeStoryBuffInfo) o; return bitField0_ == other.bitField0_ - && (!hasStoryBuffOne() || storyBuffOne == other.storyBuffOne) - && (!hasStoryBuffTwo() || storyBuffTwo == other.storyBuffTwo); + && (!hasStoryBuffTwo() || storyBuffTwo == other.storyBuffTwo) + && (!hasStoryBuffOne() || storyBuffOne == other.storyBuffOne); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(storyBuffOne); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(storyBuffTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(storyBuffTwo); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(storyBuffOne); } } @@ -230,10 +230,10 @@ public final class StartChallengeStoryBuffInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(storyBuffOne); + size += 1 + ProtoSink.computeUInt32SizeNoTag(storyBuffTwo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(storyBuffTwo); + size += 1 + ProtoSink.computeUInt32SizeNoTag(storyBuffOne); } return size; } @@ -245,18 +245,18 @@ public final class StartChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // storyBuffOne - storyBuffOne = input.readUInt32(); + case 16: { + // storyBuffTwo + storyBuffTwo = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 104) { break; } } - case 80: { - // storyBuffTwo - storyBuffTwo = input.readUInt32(); + case 104: { + // storyBuffOne + storyBuffOne = 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.storyBuffOne, storyBuffOne); + output.writeUInt32(FieldNames.storyBuffTwo, storyBuffTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.storyBuffTwo, storyBuffTwo); + output.writeUInt32(FieldNames.storyBuffOne, storyBuffOne); } output.endObject(); } @@ -296,11 +296,11 @@ public final class StartChallengeStoryBuffInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -308,11 +308,11 @@ public final class StartChallengeStoryBuffInfoOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -374,9 +374,9 @@ public final class StartChallengeStoryBuffInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName storyBuffOne = FieldName.forField("storyBuffOne", "story_buff_one"); - static final FieldName storyBuffTwo = FieldName.forField("storyBuffTwo", "story_buff_two"); + + static final FieldName storyBuffOne = FieldName.forField("storyBuffOne", "story_buff_one"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java index ee09606..d594ad9 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java @@ -19,12 +19,12 @@ public final class StartChallengeStoryInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; */ private final StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo storyBuffInfo = StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo.newInstance(); /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 8; */ private final StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo newStoryBuffInfo = StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo.newInstance(); @@ -39,7 +39,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; * @return whether the storyBuffInfo field is set */ public boolean hasStoryBuffInfo() { @@ -47,7 +47,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; * @return this */ public StartChallengeStoryInfo clearStoryBuffInfo() { @@ -57,7 +57,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -71,7 +71,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -86,7 +86,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; * @param value the storyBuffInfo to set * @return this */ @@ -98,7 +98,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 8; * @return whether the newStoryBuffInfo field is set */ public boolean hasNewStoryBuffInfo() { @@ -106,7 +106,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 8; * @return this */ public StartChallengeStoryInfo clearNewStoryBuffInfo() { @@ -116,7 +116,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_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. @@ -131,7 +131,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_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 @@ -146,7 +146,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 8; * @param value the newStoryBuffInfo to set * @return this */ @@ -224,11 +224,11 @@ public final class StartChallengeStoryInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 58); output.writeMessageNoTag(storyBuffInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 66); output.writeMessageNoTag(newStoryBuffInfo); } } @@ -252,16 +252,16 @@ public final class StartChallengeStoryInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 58: { // storyBuffInfo input.readMessage(storyBuffInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 66) { break; } } - case 106: { + case 66: { // newStoryBuffInfo input.readMessage(newStoryBuffInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java index cdc8907..27b97c2 100644 --- a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java @@ -19,22 +19,22 @@ public final class StartCocoonStageCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 world_level = 2; - */ - private int worldLevel; - - /** - * optional uint32 wave = 6; - */ - private int wave; - - /** - * optional uint32 prop_entity_id = 11; + * optional uint32 prop_entity_id = 2; */ private int propEntityId; /** - * optional uint32 cocoon_id = 14; + * optional uint32 wave = 3; + */ + private int wave; + + /** + * optional uint32 world_level = 5; + */ + private int worldLevel; + + /** + * optional uint32 cocoon_id = 10; */ private int cocoonId; @@ -49,44 +49,44 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 world_level = 2; - * @return whether the worldLevel field is set + * optional uint32 prop_entity_id = 2; + * @return whether the propEntityId field is set */ - public boolean hasWorldLevel() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 2; + * optional uint32 prop_entity_id = 2; * @return this */ - public StartCocoonStageCsReq clearWorldLevel() { + public StartCocoonStageCsReq clearPropEntityId() { bitField0_ &= ~0x00000001; - worldLevel = 0; + propEntityId = 0; return this; } /** - * optional uint32 world_level = 2; - * @return the worldLevel + * optional uint32 prop_entity_id = 2; + * @return the propEntityId */ - public int getWorldLevel() { - return worldLevel; + public int getPropEntityId() { + return propEntityId; } /** - * optional uint32 world_level = 2; - * @param value the worldLevel to set + * optional uint32 prop_entity_id = 2; + * @param value the propEntityId to set * @return this */ - public StartCocoonStageCsReq setWorldLevel(final int value) { + public StartCocoonStageCsReq setPropEntityId(final int value) { bitField0_ |= 0x00000001; - worldLevel = value; + propEntityId = value; return this; } /** - * optional uint32 wave = 6; + * optional uint32 wave = 3; * @return whether the wave field is set */ public boolean hasWave() { @@ -94,7 +94,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 wave = 6; + * optional uint32 wave = 3; * @return this */ public StartCocoonStageCsReq clearWave() { @@ -104,7 +104,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 wave = 6; + * optional uint32 wave = 3; * @return the wave */ public int getWave() { @@ -112,7 +112,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 wave = 6; + * optional uint32 wave = 3; * @param value the wave to set * @return this */ @@ -123,44 +123,44 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 11; - * @return whether the propEntityId field is set + * optional uint32 world_level = 5; + * @return whether the worldLevel field is set */ - public boolean hasPropEntityId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 prop_entity_id = 11; + * optional uint32 world_level = 5; * @return this */ - public StartCocoonStageCsReq clearPropEntityId() { + public StartCocoonStageCsReq clearWorldLevel() { bitField0_ &= ~0x00000004; - propEntityId = 0; + worldLevel = 0; return this; } /** - * optional uint32 prop_entity_id = 11; - * @return the propEntityId + * optional uint32 world_level = 5; + * @return the worldLevel */ - public int getPropEntityId() { - return propEntityId; + public int getWorldLevel() { + return worldLevel; } /** - * optional uint32 prop_entity_id = 11; - * @param value the propEntityId to set + * optional uint32 world_level = 5; + * @param value the worldLevel to set * @return this */ - public StartCocoonStageCsReq setPropEntityId(final int value) { + public StartCocoonStageCsReq setWorldLevel(final int value) { bitField0_ |= 0x00000004; - propEntityId = value; + worldLevel = value; return this; } /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 10; * @return whether the cocoonId field is set */ public boolean hasCocoonId() { @@ -168,7 +168,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 10; * @return this */ public StartCocoonStageCsReq clearCocoonId() { @@ -178,7 +178,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 10; * @return the cocoonId */ public int getCocoonId() { @@ -186,7 +186,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 10; * @param value the cocoonId to set * @return this */ @@ -201,9 +201,9 @@ public final class StartCocoonStageCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldLevel = other.worldLevel; - wave = other.wave; propEntityId = other.propEntityId; + wave = other.wave; + worldLevel = other.worldLevel; cocoonId = other.cocoonId; } return this; @@ -215,14 +215,14 @@ public final class StartCocoonStageCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); } if (other.hasWave()) { setWave(other.wave); } - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); } if (other.hasCocoonId()) { setCocoonId(other.cocoonId); @@ -237,9 +237,9 @@ public final class StartCocoonStageCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - worldLevel = 0; - wave = 0; propEntityId = 0; + wave = 0; + worldLevel = 0; cocoonId = 0; return this; } @@ -264,9 +264,9 @@ public final class StartCocoonStageCsReqOuterClass { } StartCocoonStageCsReq other = (StartCocoonStageCsReq) o; return bitField0_ == other.bitField0_ - && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasWave() || wave == other.wave) && (!hasPropEntityId() || propEntityId == other.propEntityId) + && (!hasWave() || wave == other.wave) + && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasCocoonId() || cocoonId == other.cocoonId); } @@ -274,18 +274,18 @@ public final class StartCocoonStageCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(worldLevel); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(wave); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(cocoonId); } } @@ -294,13 +294,13 @@ public final class StartCocoonStageCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); @@ -316,33 +316,33 @@ public final class StartCocoonStageCsReqOuterClass { while (true) { switch (tag) { case 16: { - // worldLevel - worldLevel = input.readUInt32(); + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 24) { break; } } - case 48: { + case 24: { // wave wave = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 40) { break; } } - case 88: { - // propEntityId - propEntityId = input.readUInt32(); + case 40: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 80) { break; } } - case 112: { + case 80: { // cocoonId cocoonId = input.readUInt32(); bitField0_ |= 0x00000008; @@ -369,13 +369,13 @@ 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.propEntityId, propEntityId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.wave, wave); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.cocoonId, cocoonId); @@ -390,11 +390,11 @@ public final class StartCocoonStageCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -413,11 +413,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_ |= 0x00000004; } } else { @@ -490,11 +490,11 @@ 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 propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); static final FieldName wave = FieldName.forField("wave"); - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); } diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java index 99c4282..c1a148b 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 wave = 1; - */ - private int wave; - - /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 11; */ private int cocoonId; + /** + * optional uint32 wave = 12; + */ + private int wave; + /** * optional uint32 prop_entity_id = 15; */ private int propEntityId; /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 9; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -54,62 +54,25 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 wave = 1; - * @return whether the wave field is set + * optional uint32 retcode = 6; + * @return whether the retcode field is set */ - public boolean hasWave() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 wave = 1; - * @return this - */ - public StartCocoonStageScRsp clearWave() { - bitField0_ &= ~0x00000001; - wave = 0; - return this; - } - - /** - * optional uint32 wave = 1; - * @return the wave - */ - public int getWave() { - return wave; - } - - /** - * optional uint32 wave = 1; - * @param value the wave to set - * @return this - */ - public StartCocoonStageScRsp setWave(final int value) { - bitField0_ |= 0x00000001; - wave = 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 = 6; * @return this */ public StartCocoonStageScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -117,36 +80,36 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ public StartCocoonStageScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 11; * @return whether the cocoonId field is set */ public boolean hasCocoonId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 11; * @return this */ public StartCocoonStageScRsp clearCocoonId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; cocoonId = 0; return this; } /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 11; * @return the cocoonId */ public int getCocoonId() { @@ -154,16 +117,53 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 cocoon_id = 14; + * optional uint32 cocoon_id = 11; * @param value the cocoonId to set * @return this */ public StartCocoonStageScRsp setCocoonId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; cocoonId = value; return this; } + /** + * optional uint32 wave = 12; + * @return whether the wave field is set + */ + public boolean hasWave() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 wave = 12; + * @return this + */ + public StartCocoonStageScRsp clearWave() { + bitField0_ &= ~0x00000004; + wave = 0; + return this; + } + + /** + * optional uint32 wave = 12; + * @return the wave + */ + public int getWave() { + return wave; + } + + /** + * optional uint32 wave = 12; + * @param value the wave to set + * @return this + */ + public StartCocoonStageScRsp setWave(final int value) { + bitField0_ |= 0x00000004; + wave = value; + return this; + } + /** * optional uint32 prop_entity_id = 15; * @return whether the propEntityId field is set @@ -202,7 +202,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 9; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -210,7 +210,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 9; * @return this */ public StartCocoonStageScRsp clearBattleInfo() { @@ -220,7 +220,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -234,7 +234,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -248,7 +248,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 9; * @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_; - wave = other.wave; retcode = other.retcode; cocoonId = other.cocoonId; + wave = other.wave; propEntityId = other.propEntityId; battleInfo.copyFrom(other.battleInfo); } @@ -279,15 +279,15 @@ public final class StartCocoonStageScRspOuterClass { return this; } cachedSize = -1; - if (other.hasWave()) { - setWave(other.wave); - } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasCocoonId()) { setCocoonId(other.cocoonId); } + if (other.hasWave()) { + setWave(other.wave); + } if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } @@ -304,9 +304,9 @@ public final class StartCocoonStageScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - wave = 0; retcode = 0; cocoonId = 0; + wave = 0; propEntityId = 0; battleInfo.clear(); return this; @@ -333,9 +333,9 @@ public final class StartCocoonStageScRspOuterClass { } StartCocoonStageScRsp other = (StartCocoonStageScRsp) o; return bitField0_ == other.bitField0_ - && (!hasWave() || wave == other.wave) && (!hasRetcode() || retcode == other.retcode) && (!hasCocoonId() || cocoonId == other.cocoonId) + && (!hasWave() || wave == other.wave) && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!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) 8); - output.writeUInt32NoTag(wave); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 88); output.writeUInt32NoTag(cocoonId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(wave); + } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 120); output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 74); output.writeMessageNoTag(battleInfo); } } @@ -368,14 +368,14 @@ public final class StartCocoonStageScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } @@ -392,27 +392,27 @@ public final class StartCocoonStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // wave - wave = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 48: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // cocoonId cocoonId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // wave + wave = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 120) { @@ -424,11 +424,11 @@ public final class StartCocoonStageScRspOuterClass { propEntityId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 50) { + if (tag != 74) { break; } } - case 50: { + case 74: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000010; @@ -455,14 +455,14 @@ public final class StartCocoonStageScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.wave, wave); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.cocoonId, cocoonId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.wave, wave); + } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.propEntityId, propEntityId); } @@ -479,22 +479,11 @@ public final class StartCocoonStageScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3642105: { - if (input.isAtField(FieldNames.wave)) { - if (!input.trySkipNullValue()) { - wave = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -506,6 +495,17 @@ public final class StartCocoonStageScRspOuterClass { if (input.isAtField(FieldNames.cocoonId)) { if (!input.trySkipNullValue()) { cocoonId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3642105: { + if (input.isAtField(FieldNames.wave)) { + if (!input.trySkipNullValue()) { + wave = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -590,12 +590,12 @@ public final class StartCocoonStageScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName wave = FieldName.forField("wave"); - static final FieldName retcode = FieldName.forField("retcode"); static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); + static final FieldName wave = FieldName.forField("wave"); + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); diff --git a/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java index 273d773..414547a 100644 --- a/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java @@ -19,15 +19,15 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 first_half = 12; - */ - private int firstHalf; - - /** - * optional uint32 second_half = 13; + * optional uint32 second_half = 3; */ private int secondHalf; + /** + * optional uint32 first_half = 10; + */ + private int firstHalf; + private StartNewChallengeStoryBuffInfo() { } @@ -39,62 +39,25 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 first_half = 12; - * @return whether the firstHalf field is set + * optional uint32 second_half = 3; + * @return whether the secondHalf field is set */ - public boolean hasFirstHalf() { + public boolean hasSecondHalf() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 first_half = 12; - * @return this - */ - public StartNewChallengeStoryBuffInfo clearFirstHalf() { - bitField0_ &= ~0x00000001; - firstHalf = 0; - return this; - } - - /** - * optional uint32 first_half = 12; - * @return the firstHalf - */ - public int getFirstHalf() { - return firstHalf; - } - - /** - * optional uint32 first_half = 12; - * @param value the firstHalf to set - * @return this - */ - public StartNewChallengeStoryBuffInfo setFirstHalf(final int value) { - bitField0_ |= 0x00000001; - firstHalf = value; - return this; - } - - /** - * optional uint32 second_half = 13; - * @return whether the secondHalf field is set - */ - public boolean hasSecondHalf() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 second_half = 13; + * optional uint32 second_half = 3; * @return this */ public StartNewChallengeStoryBuffInfo clearSecondHalf() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; secondHalf = 0; return this; } /** - * optional uint32 second_half = 13; + * optional uint32 second_half = 3; * @return the secondHalf */ public int getSecondHalf() { @@ -102,23 +65,60 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 second_half = 13; + * optional uint32 second_half = 3; * @param value the secondHalf to set * @return this */ public StartNewChallengeStoryBuffInfo setSecondHalf(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; secondHalf = value; return this; } + /** + * optional uint32 first_half = 10; + * @return whether the firstHalf field is set + */ + public boolean hasFirstHalf() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 first_half = 10; + * @return this + */ + public StartNewChallengeStoryBuffInfo clearFirstHalf() { + bitField0_ &= ~0x00000002; + firstHalf = 0; + return this; + } + + /** + * optional uint32 first_half = 10; + * @return the firstHalf + */ + public int getFirstHalf() { + return firstHalf; + } + + /** + * optional uint32 first_half = 10; + * @param value the firstHalf to set + * @return this + */ + public StartNewChallengeStoryBuffInfo setFirstHalf(final int value) { + bitField0_ |= 0x00000002; + firstHalf = 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; + firstHalf = other.firstHalf; } return this; } @@ -129,12 +129,12 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { return this; } cachedSize = -1; - if (other.hasFirstHalf()) { - setFirstHalf(other.firstHalf); - } if (other.hasSecondHalf()) { setSecondHalf(other.secondHalf); } + if (other.hasFirstHalf()) { + setFirstHalf(other.firstHalf); + } return this; } @@ -145,8 +145,8 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - firstHalf = 0; secondHalf = 0; + firstHalf = 0; return this; } @@ -170,19 +170,19 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } StartNewChallengeStoryBuffInfo other = (StartNewChallengeStoryBuffInfo) o; return bitField0_ == other.bitField0_ - && (!hasFirstHalf() || firstHalf == other.firstHalf) - && (!hasSecondHalf() || secondHalf == other.secondHalf); + && (!hasSecondHalf() || secondHalf == other.secondHalf) + && (!hasFirstHalf() || firstHalf == other.firstHalf); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(firstHalf); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(secondHalf); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(secondHalf); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(firstHalf); } } @@ -190,10 +190,10 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(firstHalf); + size += 1 + ProtoSink.computeUInt32SizeNoTag(secondHalf); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(secondHalf); + size += 1 + ProtoSink.computeUInt32SizeNoTag(firstHalf); } return size; } @@ -205,18 +205,18 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // firstHalf - firstHalf = input.readUInt32(); + case 24: { + // secondHalf + secondHalf = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { - // secondHalf - secondHalf = input.readUInt32(); + case 80: { + // firstHalf + firstHalf = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.firstHalf, firstHalf); + output.writeUInt32(FieldNames.secondHalf, secondHalf); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.secondHalf, secondHalf); + output.writeUInt32(FieldNames.firstHalf, firstHalf); } output.endObject(); } @@ -256,11 +256,11 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 132656899: - case -161164190: { - if (input.isAtField(FieldNames.firstHalf)) { + case 423501511: + case 265084190: { + if (input.isAtField(FieldNames.secondHalf)) { if (!input.trySkipNullValue()) { - firstHalf = input.readUInt32(); + secondHalf = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } break; } - case 423501511: - case 265084190: { - if (input.isAtField(FieldNames.secondHalf)) { + case 132656899: + case -161164190: { + if (input.isAtField(FieldNames.firstHalf)) { if (!input.trySkipNullValue()) { - secondHalf = input.readUInt32(); + firstHalf = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -335,9 +335,9 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { * 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"); + + static final FieldName firstHalf = FieldName.forField("firstHalf", "first_half"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java index adbb45f..a7e0c0d 100644 --- a/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java @@ -18,18 +18,18 @@ public final class StartPartialChallengeCsReqOuterClass { public static final class StartPartialChallengeCsReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 buff_id = 9; - */ - private int buffId; - /** * optional uint32 challenge_id = 10; */ private int challengeId; /** - * optional bool is_first_half = 5; + * optional uint32 buff_id = 12; + */ + private int buffId; + + /** + * optional bool is_first_half = 4; */ private boolean isFirstHalf; @@ -43,49 +43,12 @@ public final class StartPartialChallengeCsReqOuterClass { return new StartPartialChallengeCsReq(); } - /** - * optional uint32 buff_id = 9; - * @return whether the buffId field is set - */ - public boolean hasBuffId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 buff_id = 9; - * @return this - */ - public StartPartialChallengeCsReq clearBuffId() { - bitField0_ &= ~0x00000001; - buffId = 0; - return this; - } - - /** - * optional uint32 buff_id = 9; - * @return the buffId - */ - public int getBuffId() { - return buffId; - } - - /** - * optional uint32 buff_id = 9; - * @param value the buffId to set - * @return this - */ - public StartPartialChallengeCsReq setBuffId(final int value) { - bitField0_ |= 0x00000001; - buffId = value; - return this; - } - /** * optional uint32 challenge_id = 10; * @return whether the challengeId field is set */ public boolean hasChallengeId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -93,7 +56,7 @@ public final class StartPartialChallengeCsReqOuterClass { * @return this */ public StartPartialChallengeCsReq clearChallengeId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; challengeId = 0; return this; } @@ -112,13 +75,50 @@ public final class StartPartialChallengeCsReqOuterClass { * @return this */ public StartPartialChallengeCsReq setChallengeId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; challengeId = value; return this; } /** - * optional bool is_first_half = 5; + * optional uint32 buff_id = 12; + * @return whether the buffId field is set + */ + public boolean hasBuffId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 buff_id = 12; + * @return this + */ + public StartPartialChallengeCsReq clearBuffId() { + bitField0_ &= ~0x00000002; + buffId = 0; + return this; + } + + /** + * optional uint32 buff_id = 12; + * @return the buffId + */ + public int getBuffId() { + return buffId; + } + + /** + * optional uint32 buff_id = 12; + * @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 = 4; * @return whether the isFirstHalf field is set */ public boolean hasIsFirstHalf() { @@ -126,7 +126,7 @@ public final class StartPartialChallengeCsReqOuterClass { } /** - * optional bool is_first_half = 5; + * optional bool is_first_half = 4; * @return this */ public StartPartialChallengeCsReq clearIsFirstHalf() { @@ -136,7 +136,7 @@ public final class StartPartialChallengeCsReqOuterClass { } /** - * optional bool is_first_half = 5; + * optional bool is_first_half = 4; * @return the isFirstHalf */ public boolean getIsFirstHalf() { @@ -144,7 +144,7 @@ public final class StartPartialChallengeCsReqOuterClass { } /** - * optional bool is_first_half = 5; + * optional bool is_first_half = 4; * @param value the isFirstHalf to set * @return this */ @@ -159,8 +159,8 @@ public final class StartPartialChallengeCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - buffId = other.buffId; challengeId = other.challengeId; + buffId = other.buffId; isFirstHalf = other.isFirstHalf; } return this; @@ -172,12 +172,12 @@ public final class StartPartialChallengeCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasBuffId()) { - setBuffId(other.buffId); - } if (other.hasChallengeId()) { setChallengeId(other.challengeId); } + if (other.hasBuffId()) { + setBuffId(other.buffId); + } if (other.hasIsFirstHalf()) { setIsFirstHalf(other.isFirstHalf); } @@ -191,8 +191,8 @@ public final class StartPartialChallengeCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - buffId = 0; challengeId = 0; + buffId = 0; isFirstHalf = false; return this; } @@ -217,23 +217,23 @@ public final class StartPartialChallengeCsReqOuterClass { } StartPartialChallengeCsReq other = (StartPartialChallengeCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBuffId() || buffId == other.buffId) && (!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) 72); - output.writeUInt32NoTag(buffId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(challengeId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(buffId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isFirstHalf); } } @@ -242,10 +242,10 @@ public final class StartPartialChallengeCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public final class StartPartialChallengeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // buffId - buffId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } case 80: { // challengeId challengeId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { + case 96: { + // buffId + buffId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { // isFirstHalf isFirstHalf = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class StartPartialChallengeCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.buffId, buffId); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isFirstHalf, isFirstHalf); @@ -323,11 +323,11 @@ public final class StartPartialChallengeCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1378119474: - case 227990663: { - if (input.isAtField(FieldNames.buffId)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - buffId = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class StartPartialChallengeCsReqOuterClass { } break; } - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { + case -1378119474: + case 227990663: { + if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); + buffId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +412,10 @@ public final class StartPartialChallengeCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); - 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 index 584e26c..7f3703b 100644 --- a/src/generated/main/emu/lunarcore/proto/StartPartialChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeScRspOuterClass.java @@ -19,20 +19,20 @@ public final class StartPartialChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .SceneInfo scene = 1; - */ - private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); - - /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 5; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + /** + * optional .SceneInfo scene = 6; + */ + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + /** * optional .ChallengeInfo challenge_info = 9; */ @@ -49,7 +49,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; * @return this */ public StartPartialChallengeScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -86,82 +86,25 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 1; - * @return whether the scene field is set + * optional .LineupInfo lineup = 5; + * @return whether the lineup field is set */ - public boolean hasScene() { + public boolean hasLineup() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .SceneInfo scene = 1; - * @return this - */ - public StartPartialChallengeScRsp clearScene() { - bitField0_ &= ~0x00000002; - scene.clear(); - return this; - } - - /** - * optional .SceneInfo scene = 1; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableScene()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneInfoOuterClass.SceneInfo getScene() { - return scene; - } - - /** - * optional .SceneInfo scene = 1; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * 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 = 1; - * @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 = 3; - * @return whether the lineup field is set - */ - public boolean hasLineup() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 5; * @return this */ public StartPartialChallengeScRsp clearLineup() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; lineup.clear(); return this; } /** - * optional .LineupInfo lineup = 3; + * 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. @@ -175,7 +118,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 3; + * 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 @@ -184,21 +127,78 @@ public final class StartPartialChallengeScRspOuterClass { * @return internal storage object for modifications */ public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return lineup; } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 5; * @param value the lineup to set * @return this */ public StartPartialChallengeScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; lineup.copyFrom(value); return this; } + /** + * optional .SceneInfo scene = 6; + * @return whether the scene field is set + */ + public boolean hasScene() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .SceneInfo scene = 6; + * @return this + */ + public StartPartialChallengeScRsp clearScene() { + bitField0_ &= ~0x00000004; + scene.clear(); + return this; + } + + /** + * optional .SceneInfo scene = 6; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableScene()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneInfoOuterClass.SceneInfo getScene() { + return scene; + } + + /** + * optional .SceneInfo scene = 6; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public SceneInfoOuterClass.SceneInfo getMutableScene() { + bitField0_ |= 0x00000004; + return scene; + } + + /** + * optional .SceneInfo scene = 6; + * @param value the scene to set + * @return this + */ + public StartPartialChallengeScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { + bitField0_ |= 0x00000004; + scene.copyFrom(value); + return this; + } + /** * optional .ChallengeInfo challenge_info = 9; * @return whether the challengeInfo field is set @@ -263,8 +263,8 @@ public final class StartPartialChallengeScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - scene.copyFrom(other.scene); lineup.copyFrom(other.lineup); + scene.copyFrom(other.scene); challengeInfo.copyFrom(other.challengeInfo); } return this; @@ -279,12 +279,12 @@ public final class StartPartialChallengeScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasScene()) { - getMutableScene().mergeFrom(other.scene); - } if (other.hasLineup()) { getMutableLineup().mergeFrom(other.lineup); } + if (other.hasScene()) { + getMutableScene().mergeFrom(other.scene); + } if (other.hasChallengeInfo()) { getMutableChallengeInfo().mergeFrom(other.challengeInfo); } @@ -299,8 +299,8 @@ public final class StartPartialChallengeScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - scene.clear(); lineup.clear(); + scene.clear(); challengeInfo.clear(); return this; } @@ -312,8 +312,8 @@ public final class StartPartialChallengeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - scene.clearQuick(); lineup.clearQuick(); + scene.clearQuick(); challengeInfo.clearQuick(); return this; } @@ -329,24 +329,24 @@ public final class StartPartialChallengeScRspOuterClass { StartPartialChallengeScRsp other = (StartPartialChallengeScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasScene() || scene.equals(other.scene)) && (!hasLineup() || lineup.equals(other.lineup)) + && (!hasScene() || scene.equals(other.scene)) && (!hasChallengeInfo() || challengeInfo.equals(other.challengeInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(scene); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(lineup); + output.writeRawByte((byte) 50); + output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 74); @@ -361,10 +361,10 @@ public final class StartPartialChallengeScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); @@ -379,27 +379,27 @@ public final class StartPartialChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { - // scene - input.readMessage(scene); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { + case 42: { // lineup input.readMessage(lineup); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // scene + input.readMessage(scene); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 74) { @@ -436,10 +436,10 @@ public final class StartPartialChallengeScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.scene, scene); + output.writeMessage(FieldNames.lineup, lineup); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.challengeInfo, challengeInfo); @@ -465,10 +465,10 @@ public final class StartPartialChallengeScRspOuterClass { } break; } - case 109254796: { - if (input.isAtField(FieldNames.scene)) { + case -1102671473: { + if (input.isAtField(FieldNames.lineup)) { if (!input.trySkipNullValue()) { - input.readMessage(scene); + input.readMessage(lineup); bitField0_ |= 0x00000002; } } else { @@ -476,10 +476,10 @@ public final class StartPartialChallengeScRspOuterClass { } break; } - case -1102671473: { - if (input.isAtField(FieldNames.lineup)) { + case 109254796: { + if (input.isAtField(FieldNames.scene)) { if (!input.trySkipNullValue()) { - input.readMessage(lineup); + input.readMessage(scene); bitField0_ |= 0x00000004; } } else { @@ -554,10 +554,10 @@ public final class StartPartialChallengeScRspOuterClass { 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 scene = FieldName.forField("scene"); + 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 fd4feb8..9e98f08 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 = 1; + * optional uint32 buff_aeon_id = 11; */ private int buffAeonId; /** - * optional uint32 area_id = 15; + * optional uint32 area_id = 13; */ private int areaId; /** - * repeated uint32 base_avatar_id_list = 4; + * repeated uint32 base_avatar_id_list = 7; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 1; + * optional uint32 buff_aeon_id = 11; * @return whether the buffAeonId field is set */ public boolean hasBuffAeonId() { @@ -53,7 +53,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 1; + * optional uint32 buff_aeon_id = 11; * @return this */ public StartRogueCsReq clearBuffAeonId() { @@ -63,7 +63,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 1; + * optional uint32 buff_aeon_id = 11; * @return the buffAeonId */ public int getBuffAeonId() { @@ -71,7 +71,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 1; + * optional uint32 buff_aeon_id = 11; * @param value the buffAeonId to set * @return this */ @@ -82,7 +82,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 15; + * optional uint32 area_id = 13; * @return whether the areaId field is set */ public boolean hasAreaId() { @@ -90,7 +90,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 15; + * optional uint32 area_id = 13; * @return this */ public StartRogueCsReq clearAreaId() { @@ -100,7 +100,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 15; + * optional uint32 area_id = 13; * @return the areaId */ public int getAreaId() { @@ -108,7 +108,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 15; + * optional uint32 area_id = 13; * @param value the areaId to set * @return this */ @@ -119,7 +119,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 4; + * repeated uint32 base_avatar_id_list = 7; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -127,7 +127,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 4; + * repeated uint32 base_avatar_id_list = 7; * @return this */ public StartRogueCsReq clearBaseAvatarIdList() { @@ -137,7 +137,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 4; + * repeated uint32 base_avatar_id_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 4; + * repeated uint32 base_avatar_id_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 4; + * repeated uint32 base_avatar_id_list = 7; * @param value the baseAvatarIdList to add * @return this */ @@ -176,7 +176,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 4; + * repeated uint32 base_avatar_id_list = 7; * @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) 8); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(buffAeonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -295,25 +295,25 @@ public final class StartRogueCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 88: { // buffAeonId buffAeonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { + case 104: { // areaId areaId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 58) { break; } } - case 34: { + case 58: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000004; @@ -332,7 +332,7 @@ public final class StartRogueCsReqOuterClass { tag = input.readTag(); break; } - case 32: { + case 56: { // 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 79d6de6..032feb4 100644 --- a/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java @@ -19,25 +19,25 @@ public final class StartRogueScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional .SceneInfo scene = 2; - */ - private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); - - /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 1; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 9; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); + /** + * optional .SceneInfo scene = 12; + */ + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + private StartRogueScRsp() { } @@ -49,7 +49,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; * @return this */ public StartRogueScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -86,82 +86,25 @@ public final class StartRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 2; - * @return whether the scene field is set + * optional .LineupInfo lineup = 1; + * @return whether the lineup field is set */ - public boolean hasScene() { + public boolean hasLineup() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .SceneInfo scene = 2; - * @return this - */ - public StartRogueScRsp clearScene() { - bitField0_ &= ~0x00000002; - scene.clear(); - return this; - } - - /** - * 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. - * - * Use {@link #getMutableScene()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneInfoOuterClass.SceneInfo getScene() { - return scene; - } - - /** - * 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 - * 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 = 2; - * @param value the scene to set - * @return this - */ - public StartRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000002; - scene.copyFrom(value); - return this; - } - - /** - * optional .LineupInfo lineup = 7; - * @return whether the lineup field is set - */ - public boolean hasLineup() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 1; * @return this */ public StartRogueScRsp clearLineup() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; lineup.clear(); return this; } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 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. @@ -175,7 +118,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 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 @@ -184,41 +127,41 @@ public final class StartRogueScRspOuterClass { * @return internal storage object for modifications */ public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return lineup; } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 1; * @param value the lineup to set * @return this */ public StartRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; lineup.copyFrom(value); return this; } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 9; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 9; * @return this */ public StartRogueScRsp clearRogueInfo() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; rogueInfo.clear(); return this; } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -232,7 +175,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -241,30 +184,87 @@ public final class StartRogueScRspOuterClass { * @return internal storage object for modifications */ public RogueInfoOuterClass.RogueInfo getMutableRogueInfo() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return rogueInfo; } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 9; * @param value the rogueInfo to set * @return this */ public StartRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; rogueInfo.copyFrom(value); return this; } + /** + * optional .SceneInfo scene = 12; + * @return whether the scene field is set + */ + public boolean hasScene() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .SceneInfo scene = 12; + * @return this + */ + public StartRogueScRsp clearScene() { + bitField0_ &= ~0x00000008; + scene.clear(); + return this; + } + + /** + * optional .SceneInfo scene = 12; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableScene()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneInfoOuterClass.SceneInfo getScene() { + return scene; + } + + /** + * optional .SceneInfo scene = 12; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public SceneInfoOuterClass.SceneInfo getMutableScene() { + bitField0_ |= 0x00000008; + return scene; + } + + /** + * optional .SceneInfo scene = 12; + * @param value the scene to set + * @return this + */ + public StartRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { + bitField0_ |= 0x00000008; + scene.copyFrom(value); + return this; + } + @Override public StartRogueScRsp copyFrom(final StartRogueScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - scene.copyFrom(other.scene); lineup.copyFrom(other.lineup); rogueInfo.copyFrom(other.rogueInfo); + scene.copyFrom(other.scene); } return this; } @@ -278,15 +278,15 @@ public final class StartRogueScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasScene()) { - getMutableScene().mergeFrom(other.scene); - } if (other.hasLineup()) { getMutableLineup().mergeFrom(other.lineup); } if (other.hasRogueInfo()) { getMutableRogueInfo().mergeFrom(other.rogueInfo); } + if (other.hasScene()) { + getMutableScene().mergeFrom(other.scene); + } return this; } @@ -298,9 +298,9 @@ public final class StartRogueScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - scene.clear(); lineup.clear(); rogueInfo.clear(); + scene.clear(); return this; } @@ -311,9 +311,9 @@ public final class StartRogueScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - scene.clearQuick(); lineup.clearQuick(); rogueInfo.clearQuick(); + scene.clearQuick(); return this; } @@ -328,28 +328,28 @@ public final class StartRogueScRspOuterClass { StartRogueScRsp other = (StartRogueScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasScene() || scene.equals(other.scene)) && (!hasLineup() || lineup.equals(other.lineup)) - && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)); + && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)) + && (!hasScene() || scene.equals(other.scene)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(scene); + output.writeRawByte((byte) 10); + output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(lineup); + output.writeRawByte((byte) 74); + output.writeMessageNoTag(rogueInfo); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 98); - output.writeMessageNoTag(rogueInfo); + output.writeMessageNoTag(scene); } } @@ -360,14 +360,14 @@ public final class StartRogueScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + } return size; } @@ -378,27 +378,27 @@ public final class StartRogueScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { - // scene - input.readMessage(scene); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { + case 10: { // lineup input.readMessage(lineup); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // rogueInfo + input.readMessage(rogueInfo); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 98) { @@ -406,8 +406,8 @@ public final class StartRogueScRspOuterClass { } } case 98: { - // rogueInfo - input.readMessage(rogueInfo); + // scene + input.readMessage(scene); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -435,14 +435,14 @@ public final class StartRogueScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.scene, scene); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.lineup, lineup); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.rogueInfo, rogueInfo); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.scene, scene); + } output.endObject(); } @@ -464,22 +464,11 @@ public final class StartRogueScRspOuterClass { } break; } - case 109254796: { - if (input.isAtField(FieldNames.scene)) { - if (!input.trySkipNullValue()) { - input.readMessage(scene); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1102671473: { if (input.isAtField(FieldNames.lineup)) { if (!input.trySkipNullValue()) { input.readMessage(lineup); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -491,6 +480,17 @@ public final class StartRogueScRspOuterClass { if (input.isAtField(FieldNames.rogueInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueInfo); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109254796: { + if (input.isAtField(FieldNames.scene)) { + if (!input.trySkipNullValue()) { + input.readMessage(scene); bitField0_ |= 0x00000008; } } else { @@ -553,11 +553,11 @@ public final class StartRogueScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName scene = FieldName.forField("scene"); - static final FieldName lineup = FieldName.forField("lineup"); static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); + + static final FieldName scene = FieldName.forField("scene"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SummonPetCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SummonPetCsReqOuterClass.java new file mode 100644 index 0000000..536cd0e --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SummonPetCsReqOuterClass.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 SummonPetCsReqOuterClass { + /** + * Protobuf type {@code SummonPetCsReq} + */ + public static final class SummonPetCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 summoned_pet_id = 10; + */ + private int summonedPetId; + + private SummonPetCsReq() { + } + + /** + * @return a new empty instance of {@code SummonPetCsReq} + */ + public static SummonPetCsReq newInstance() { + return new SummonPetCsReq(); + } + + /** + * optional uint32 summoned_pet_id = 10; + * @return whether the summonedPetId field is set + */ + public boolean hasSummonedPetId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 summoned_pet_id = 10; + * @return this + */ + public SummonPetCsReq clearSummonedPetId() { + bitField0_ &= ~0x00000001; + summonedPetId = 0; + return this; + } + + /** + * optional uint32 summoned_pet_id = 10; + * @return the summonedPetId + */ + public int getSummonedPetId() { + return summonedPetId; + } + + /** + * optional uint32 summoned_pet_id = 10; + * @param value the summonedPetId to set + * @return this + */ + public SummonPetCsReq setSummonedPetId(final int value) { + bitField0_ |= 0x00000001; + summonedPetId = value; + return this; + } + + @Override + public SummonPetCsReq copyFrom(final SummonPetCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + summonedPetId = other.summonedPetId; + } + return this; + } + + @Override + public SummonPetCsReq mergeFrom(final SummonPetCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasSummonedPetId()) { + setSummonedPetId(other.summonedPetId); + } + return this; + } + + @Override + public SummonPetCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + summonedPetId = 0; + return this; + } + + @Override + public SummonPetCsReq 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 SummonPetCsReq)) { + return false; + } + SummonPetCsReq other = (SummonPetCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasSummonedPetId() || summonedPetId == other.summonedPetId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(summonedPetId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(summonedPetId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SummonPetCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 80: { + // summonedPetId + summonedPetId = 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.summonedPetId, summonedPetId); + } + output.endObject(); + } + + @Override + public SummonPetCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1942999750: + case 1818014746: { + if (input.isAtField(FieldNames.summonedPetId)) { + if (!input.trySkipNullValue()) { + summonedPetId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SummonPetCsReq clone() { + return new SummonPetCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SummonPetCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SummonPetCsReq(), data).checkInitialized(); + } + + public static SummonPetCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SummonPetCsReq(), input).checkInitialized(); + } + + public static SummonPetCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SummonPetCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating SummonPetCsReq messages + */ + public static MessageFactory getFactory() { + return SummonPetCsReqFactory.INSTANCE; + } + + private enum SummonPetCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public SummonPetCsReq create() { + return SummonPetCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName summonedPetId = FieldName.forField("summonedPetId", "summoned_pet_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SummonPetScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SummonPetScRspOuterClass.java new file mode 100644 index 0000000..c3b5b18 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SummonPetScRspOuterClass.java @@ -0,0 +1,420 @@ +// 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 SummonPetScRspOuterClass { + /** + * Protobuf type {@code SummonPetScRsp} + */ + public static final class SummonPetScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 cur_pet_id = 2; + */ + private int curPetId; + + /** + * optional uint32 BMCOIJCMNNC = 6; + */ + private int bMCOIJCMNNC; + + /** + * optional uint32 retcode = 11; + */ + private int retcode; + + private SummonPetScRsp() { + } + + /** + * @return a new empty instance of {@code SummonPetScRsp} + */ + public static SummonPetScRsp newInstance() { + return new SummonPetScRsp(); + } + + /** + * optional uint32 cur_pet_id = 2; + * @return whether the curPetId field is set + */ + public boolean hasCurPetId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 cur_pet_id = 2; + * @return this + */ + public SummonPetScRsp clearCurPetId() { + bitField0_ &= ~0x00000001; + curPetId = 0; + return this; + } + + /** + * optional uint32 cur_pet_id = 2; + * @return the curPetId + */ + public int getCurPetId() { + return curPetId; + } + + /** + * optional uint32 cur_pet_id = 2; + * @param value the curPetId to set + * @return this + */ + public SummonPetScRsp setCurPetId(final int value) { + bitField0_ |= 0x00000001; + curPetId = value; + return this; + } + + /** + * optional uint32 BMCOIJCMNNC = 6; + * @return whether the bMCOIJCMNNC field is set + */ + public boolean hasBMCOIJCMNNC() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 BMCOIJCMNNC = 6; + * @return this + */ + public SummonPetScRsp clearBMCOIJCMNNC() { + bitField0_ &= ~0x00000002; + bMCOIJCMNNC = 0; + return this; + } + + /** + * optional uint32 BMCOIJCMNNC = 6; + * @return the bMCOIJCMNNC + */ + public int getBMCOIJCMNNC() { + return bMCOIJCMNNC; + } + + /** + * optional uint32 BMCOIJCMNNC = 6; + * @param value the bMCOIJCMNNC to set + * @return this + */ + public SummonPetScRsp setBMCOIJCMNNC(final int value) { + bitField0_ |= 0x00000002; + bMCOIJCMNNC = value; + return this; + } + + /** + * optional uint32 retcode = 11; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 11; + * @return this + */ + public SummonPetScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 11; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 11; + * @param value the retcode to set + * @return this + */ + public SummonPetScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + @Override + public SummonPetScRsp copyFrom(final SummonPetScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + curPetId = other.curPetId; + bMCOIJCMNNC = other.bMCOIJCMNNC; + retcode = other.retcode; + } + return this; + } + + @Override + public SummonPetScRsp mergeFrom(final SummonPetScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasCurPetId()) { + setCurPetId(other.curPetId); + } + if (other.hasBMCOIJCMNNC()) { + setBMCOIJCMNNC(other.bMCOIJCMNNC); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + return this; + } + + @Override + public SummonPetScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + curPetId = 0; + bMCOIJCMNNC = 0; + retcode = 0; + return this; + } + + @Override + public SummonPetScRsp 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 SummonPetScRsp)) { + return false; + } + SummonPetScRsp other = (SummonPetScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasCurPetId() || curPetId == other.curPetId) + && (!hasBMCOIJCMNNC() || bMCOIJCMNNC == other.bMCOIJCMNNC) + && (!hasRetcode() || retcode == other.retcode); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(curPetId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(bMCOIJCMNNC); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(retcode); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curPetId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(bMCOIJCMNNC); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SummonPetScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 16: { + // curPetId + curPetId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // bMCOIJCMNNC + bMCOIJCMNNC = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + 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.curPetId, curPetId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.bMCOIJCMNNC, bMCOIJCMNNC); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + output.endObject(); + } + + @Override + public SummonPetScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 544007226: + case -465065190: { + if (input.isAtField(FieldNames.curPetId)) { + if (!input.trySkipNullValue()) { + curPetId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1362418561: { + if (input.isAtField(FieldNames.bMCOIJCMNNC)) { + if (!input.trySkipNullValue()) { + bMCOIJCMNNC = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SummonPetScRsp clone() { + return new SummonPetScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SummonPetScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SummonPetScRsp(), data).checkInitialized(); + } + + public static SummonPetScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SummonPetScRsp(), input).checkInitialized(); + } + + public static SummonPetScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SummonPetScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating SummonPetScRsp messages + */ + public static MessageFactory getFactory() { + return SummonPetScRspFactory.INSTANCE; + } + + private enum SummonPetScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public SummonPetScRsp create() { + return SummonPetScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName curPetId = FieldName.forField("curPetId", "cur_pet_id"); + + static final FieldName bMCOIJCMNNC = FieldName.forField("BMCOIJCMNNC"); + + static final FieldName retcode = FieldName.forField("retcode"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java index 6d60177..06c0f05 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 = 8; + * optional uint32 index = 13; */ private int index; @@ -34,7 +34,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 13; * @return whether the index field is set */ public boolean hasIndex() { @@ -42,7 +42,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 13; * @return this */ public SwitchLineupIndexCsReq clearIndex() { @@ -52,7 +52,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 13; * @return the index */ public int getIndex() { @@ -60,7 +60,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 13; * @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) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(index); } } @@ -150,7 +150,7 @@ public final class SwitchLineupIndexCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 104: { // 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 8489e58..a2d22ba 100644 --- a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SwitchLineupIndexScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional uint32 index = 13; + * optional uint32 index = 7; */ private int index; @@ -39,7 +39,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * 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 SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return this */ public SwitchLineupIndexScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 7; * @return whether the index field is set */ public boolean hasIndex() { @@ -84,7 +84,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 7; * @return this */ public SwitchLineupIndexScRsp clearIndex() { @@ -94,7 +94,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 7; * @return the index */ public int getIndex() { @@ -102,7 +102,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 7; * @param value the index to set * @return this */ @@ -177,11 +177,11 @@ public final class SwitchLineupIndexScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(index); } } @@ -205,16 +205,16 @@ public final class SwitchLineupIndexScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 56) { break; } } - case 104: { + case 56: { // index index = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java index 5b853f4..bbbfeef 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 = 15; + * optional .FriendApplyInfo friend_apply_info = 6; */ private final FriendApplyInfoOuterClass.FriendApplyInfo friendApplyInfo = FriendApplyInfoOuterClass.FriendApplyInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 15; + * optional .FriendApplyInfo friend_apply_info = 6; * @return whether the friendApplyInfo field is set */ public boolean hasFriendApplyInfo() { @@ -42,7 +42,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 15; + * optional .FriendApplyInfo friend_apply_info = 6; * @return this */ public SyncApplyFriendScNotify clearFriendApplyInfo() { @@ -52,7 +52,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 15; + * optional .FriendApplyInfo friend_apply_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. @@ -66,7 +66,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 15; + * optional .FriendApplyInfo friend_apply_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 @@ -80,7 +80,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 15; + * optional .FriendApplyInfo friend_apply_info = 6; * @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) 122); + output.writeRawByte((byte) 50); output.writeMessageNoTag(friendApplyInfo); } } @@ -172,7 +172,7 @@ public final class SyncApplyFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 50: { // 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 c27eca1..9c83d4b 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 = 14; + * optional uint32 client_res_version = 7; */ private int clientResVersion; @@ -34,7 +34,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 14; + * optional uint32 client_res_version = 7; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { @@ -42,7 +42,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 14; + * optional uint32 client_res_version = 7; * @return this */ public SyncClientResVersionCsReq clearClientResVersion() { @@ -52,7 +52,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 14; + * optional uint32 client_res_version = 7; * @return the clientResVersion */ public int getClientResVersion() { @@ -60,7 +60,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 14; + * optional uint32 client_res_version = 7; * @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) 112); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(clientResVersion); } } @@ -150,7 +150,7 @@ public final class SyncClientResVersionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 56: { // 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 9e60f8a..eb6771b 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java @@ -19,15 +19,15 @@ public final class SyncClientResVersionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; - */ - private int retcode; - - /** - * optional uint32 client_res_version = 10; + * optional uint32 client_res_version = 3; */ private int clientResVersion; + /** + * optional uint32 retcode = 12; + */ + private int retcode; + private SyncClientResVersionScRsp() { } @@ -39,62 +39,25 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 client_res_version = 3; + * @return whether the clientResVersion field is set */ - public boolean hasRetcode() { + public boolean hasClientResVersion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public SyncClientResVersionScRsp 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 SyncClientResVersionScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 client_res_version = 10; - * @return whether the clientResVersion field is set - */ - public boolean hasClientResVersion() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 client_res_version = 10; + * optional uint32 client_res_version = 3; * @return this */ public SyncClientResVersionScRsp clearClientResVersion() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; clientResVersion = 0; return this; } /** - * optional uint32 client_res_version = 10; + * optional uint32 client_res_version = 3; * @return the clientResVersion */ public int getClientResVersion() { @@ -102,23 +65,60 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 10; + * optional uint32 client_res_version = 3; * @param value the clientResVersion to set * @return this */ public SyncClientResVersionScRsp setClientResVersion(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; clientResVersion = 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 SyncClientResVersionScRsp 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 SyncClientResVersionScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public SyncClientResVersionScRsp copyFrom(final SyncClientResVersionScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; clientResVersion = other.clientResVersion; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class SyncClientResVersionScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasClientResVersion()) { setClientResVersion(other.clientResVersion); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class SyncClientResVersionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; clientResVersion = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class SyncClientResVersionScRspOuterClass { } SyncClientResVersionScRsp other = (SyncClientResVersionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasClientResVersion() || clientResVersion == other.clientResVersion); + && (!hasClientResVersion() || clientResVersion == other.clientResVersion) + && (!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(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(clientResVersion); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class SyncClientResVersionScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class SyncClientResVersionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // retcode - retcode = input.readUInt32(); + case 24: { + // clientResVersion + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 96) { break; } } - case 80: { - // clientResVersion - clientResVersion = input.readUInt32(); + case 96: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SyncClientResVersionScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.clientResVersion, clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.clientResVersion, clientResVersion); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public final class SyncClientResVersionScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -2005674429: + case -349907515: { + if (input.isAtField(FieldNames.clientResVersion)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class SyncClientResVersionScRspOuterClass { } break; } - case -2005674429: - case -349907515: { - if (input.isAtField(FieldNames.clientResVersion)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - clientResVersion = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class SyncClientResVersionScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java index fd2d76a..31a1bc3 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 = 12; + * optional uint32 uid = 1; */ private int uid; @@ -34,7 +34,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 12; + * optional uint32 uid = 1; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 12; + * optional uint32 uid = 1; * @return this */ public SyncDeleteFriendScNotify clearUid() { @@ -52,7 +52,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 12; + * optional uint32 uid = 1; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 12; + * optional uint32 uid = 1; * @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) 96); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 8: { // 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 d2fc0fa..0524274 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 = 10; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 12; */ private final RepeatedMessage entityBuffInfoList = RepeatedMessage.newEmptyInstance(EntityBuffChangeInfoOuterClass.EntityBuffChangeInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 12; * @return whether the entityBuffInfoList field is set */ public boolean hasEntityBuffInfoList() { @@ -43,7 +43,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 12; * @return this */ public SyncEntityBuffChangeListScNotify clearEntityBuffInfoList() { @@ -53,7 +53,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -68,7 +68,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -83,7 +83,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 12; * @param value the entityBuffInfoList to add * @return this */ @@ -95,7 +95,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 12; * @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) 82); + output.writeRawByte((byte) 98); output.writeMessageNoTag(entityBuffInfoList.get(i)); } } @@ -190,7 +190,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 98: { // 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 43dbf46..6239152 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 = 13; + * optional uint32 uid = 5; */ private int uid; /** - * optional bool handle_result = 8; + * optional bool handle_result = 2; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 14; + * optional .FriendListInfo handle_friend_info = 8; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -44,7 +44,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 5; * @return whether the uid field is set */ public boolean hasUid() { @@ -52,7 +52,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 5; * @return this */ public SyncHandleFriendScNotify clearUid() { @@ -62,7 +62,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 5; * @return the uid */ public int getUid() { @@ -70,7 +70,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 5; * @param value the uid to set * @return this */ @@ -81,7 +81,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 8; + * optional bool handle_result = 2; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -89,7 +89,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 8; + * optional bool handle_result = 2; * @return this */ public SyncHandleFriendScNotify clearHandleResult() { @@ -99,7 +99,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 8; + * optional bool handle_result = 2; * @return the handleResult */ public boolean getHandleResult() { @@ -107,7 +107,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 8; + * optional bool handle_result = 2; * @param value the handleResult to set * @return this */ @@ -118,7 +118,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 14; + * optional .FriendListInfo handle_friend_info = 8; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -126,7 +126,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 14; + * optional .FriendListInfo handle_friend_info = 8; * @return this */ public SyncHandleFriendScNotify clearHandleFriendInfo() { @@ -136,7 +136,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 14; + * optional .FriendListInfo handle_friend_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 SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 14; + * optional .FriendListInfo handle_friend_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 SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 14; + * optional .FriendListInfo handle_friend_info = 8; * @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) 104); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 66); output.writeMessageNoTag(handleFriendInfo); } } @@ -282,25 +282,25 @@ public final class SyncHandleFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 40: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 16) { break; } } - case 64: { + case 16: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 66) { break; } } - case 114: { + case 66: { // 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 ce756c3..0be7d2e 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java @@ -20,14 +20,14 @@ public final class SyncLineupNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 14; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * repeated .SyncReason reason_list = 1; + * repeated .SyncLineupReason reason_list = 3; */ - private final RepeatedEnum reasonList = RepeatedEnum.newEmptyInstance(SyncReasonOuterClass.SyncReason.converter()); + private final RepeatedEnum reasonList = RepeatedEnum.newEmptyInstance(SyncLineupReasonOuterClass.SyncLineupReason.converter()); private SyncLineupNotify() { } @@ -40,7 +40,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 14; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -48,7 +48,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 14; * @return this */ public SyncLineupNotify clearLineup() { @@ -58,7 +58,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 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. @@ -72,7 +72,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 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 @@ -86,7 +86,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 14; * @param value the lineup to set * @return this */ @@ -97,7 +97,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 1; + * repeated .SyncLineupReason reason_list = 3; * @return whether the reasonList field is set */ public boolean hasReasonList() { @@ -105,7 +105,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 1; + * repeated .SyncLineupReason reason_list = 3; * @return this */ public SyncLineupNotify clearReasonList() { @@ -115,7 +115,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 1; + * repeated .SyncLineupReason reason_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. @@ -124,12 +124,12 @@ public final class SyncLineupNotifyOuterClass { * * @return internal storage object for reading */ - public RepeatedEnum getReasonList() { + public RepeatedEnum getReasonList() { return reasonList; } /** - * repeated .SyncReason reason_list = 1; + * repeated .SyncLineupReason reason_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 @@ -137,28 +137,29 @@ public final class SyncLineupNotifyOuterClass { * * @return internal storage object for modifications */ - public RepeatedEnum getMutableReasonList() { + public RepeatedEnum getMutableReasonList() { bitField0_ |= 0x00000002; return reasonList; } /** - * repeated .SyncReason reason_list = 1; + * repeated .SyncLineupReason reason_list = 3; * @param value the reasonList to add * @return this */ - public SyncLineupNotify addReasonList(final SyncReasonOuterClass.SyncReason value) { + public SyncLineupNotify addReasonList(final SyncLineupReasonOuterClass.SyncLineupReason value) { bitField0_ |= 0x00000002; reasonList.add(value); return this; } /** - * repeated .SyncReason reason_list = 1; + * repeated .SyncLineupReason reason_list = 3; * @param values the reasonList to add * @return this */ - public SyncLineupNotify addAllReasonList(final SyncReasonOuterClass.SyncReason... values) { + public SyncLineupNotify addAllReasonList( + final SyncLineupReasonOuterClass.SyncLineupReason... values) { bitField0_ |= 0x00000002; reasonList.addAll(values); return this; @@ -231,12 +232,12 @@ public final class SyncLineupNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 114); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < reasonList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeEnumNoTag(reasonList.array()[i]); } } @@ -261,16 +262,16 @@ public final class SyncLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 114: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 26) { break; } } - case 10: { + case 26: { // reasonList [packed=true] input.readPackedEnum(reasonList, tag); bitField0_ |= 0x00000002; @@ -289,7 +290,7 @@ public final class SyncLineupNotifyOuterClass { tag = input.readTag(); break; } - case 8: { + case 24: { // reasonList [packed=false] tag = input.readRepeatedEnum(reasonList, tag); bitField0_ |= 0x00000002; @@ -333,7 +334,7 @@ public final class SyncLineupNotifyOuterClass { case 937206201: { if (input.isAtField(FieldNames.reasonList)) { if (!input.trySkipNullValue()) { - input.readRepeatedEnum(reasonList, SyncReasonOuterClass.SyncReason.converter()); + input.readRepeatedEnum(reasonList, SyncLineupReasonOuterClass.SyncLineupReason.converter()); bitField0_ |= 0x00000002; } } else { diff --git a/src/generated/main/emu/lunarcore/proto/SyncLineupReasonOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncLineupReasonOuterClass.java new file mode 100644 index 0000000..5a398cd --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SyncLineupReasonOuterClass.java @@ -0,0 +1,160 @@ +// 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 SyncLineupReasonOuterClass { + /** + * Protobuf enum {@code SyncLineupReason} + */ + public enum SyncLineupReason implements ProtoEnum { + /** + * SYNC_REASON_NONE = 0; + */ + SYNC_REASON_NONE("SYNC_REASON_NONE", 0), + + /** + * SYNC_REASON_MP_ADD = 1; + */ + SYNC_REASON_MP_ADD("SYNC_REASON_MP_ADD", 1), + + /** + * SYNC_REASON_MP_ADD_PROP_HIT = 2; + */ + SYNC_REASON_MP_ADD_PROP_HIT("SYNC_REASON_MP_ADD_PROP_HIT", 2), + + /** + * SYNC_REASON_HP_ADD = 3; + */ + SYNC_REASON_HP_ADD("SYNC_REASON_HP_ADD", 3), + + /** + * SYNC_REASON_HP_ADD_PROP_HIT = 4; + */ + SYNC_REASON_HP_ADD_PROP_HIT("SYNC_REASON_HP_ADD_PROP_HIT", 4); + + /** + * SYNC_REASON_NONE = 0; + */ + public static final int SYNC_REASON_NONE_VALUE = 0; + + /** + * SYNC_REASON_MP_ADD = 1; + */ + public static final int SYNC_REASON_MP_ADD_VALUE = 1; + + /** + * SYNC_REASON_MP_ADD_PROP_HIT = 2; + */ + public static final int SYNC_REASON_MP_ADD_PROP_HIT_VALUE = 2; + + /** + * SYNC_REASON_HP_ADD = 3; + */ + public static final int SYNC_REASON_HP_ADD_VALUE = 3; + + /** + * SYNC_REASON_HP_ADD_PROP_HIT = 4; + */ + public static final int SYNC_REASON_HP_ADD_PROP_HIT_VALUE = 4; + + private final String name; + + private final int number; + + private SyncLineupReason(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 SyncLineupReasonConverter.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 SyncLineupReason forNumber(int value) { + return SyncLineupReasonConverter.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 SyncLineupReason forNumberOr(int number, SyncLineupReason other) { + SyncLineupReason value = forNumber(number); + return value == null ? other : value; + } + + enum SyncLineupReasonConverter implements ProtoEnum.EnumConverter { + INSTANCE; + + private static final SyncLineupReason[] lookup = new SyncLineupReason[5]; + + static { + lookup[0] = SYNC_REASON_NONE; + lookup[1] = SYNC_REASON_MP_ADD; + lookup[2] = SYNC_REASON_MP_ADD_PROP_HIT; + lookup[3] = SYNC_REASON_HP_ADD; + lookup[4] = SYNC_REASON_HP_ADD_PROP_HIT; + } + + @Override + public final SyncLineupReason forNumber(final int value) { + if (value >= 0 && value < lookup.length) { + return lookup[value]; + } + return null; + } + + @Override + public final SyncLineupReason forName(final CharSequence value) { + if (value.length() == 16) { + if (ProtoUtil.isEqual("SYNC_REASON_NONE", value)) { + return SYNC_REASON_NONE; + } + } + if (value.length() == 18) { + if (ProtoUtil.isEqual("SYNC_REASON_MP_ADD", value)) { + return SYNC_REASON_MP_ADD; + } + if (ProtoUtil.isEqual("SYNC_REASON_HP_ADD", value)) { + return SYNC_REASON_HP_ADD; + } + } + if (value.length() == 27) { + if (ProtoUtil.isEqual("SYNC_REASON_MP_ADD_PROP_HIT", value)) { + return SYNC_REASON_MP_ADD_PROP_HIT; + } + if (ProtoUtil.isEqual("SYNC_REASON_HP_ADD_PROP_HIT", value)) { + return SYNC_REASON_HP_ADD_PROP_HIT; + } + } + return null; + } + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java index be5353f..3c07354 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java @@ -20,7 +20,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rogue_version_id = 7; + * optional uint32 rogue_version_id = 12; */ private int rogueVersionId; @@ -30,7 +30,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { private int displayType; /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_list = 14; */ private final RepeatedMessage actionResultList = RepeatedMessage.newEmptyInstance(RogueActionResultOuterClass.RogueActionResult.getFactory()); @@ -45,7 +45,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 7; + * optional uint32 rogue_version_id = 12; * @return whether the rogueVersionId field is set */ public boolean hasRogueVersionId() { @@ -53,7 +53,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 7; + * optional uint32 rogue_version_id = 12; * @return this */ public SyncRogueCommonActionResultScNotify clearRogueVersionId() { @@ -63,7 +63,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 7; + * optional uint32 rogue_version_id = 12; * @return the rogueVersionId */ public int getRogueVersionId() { @@ -71,7 +71,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 7; + * optional uint32 rogue_version_id = 12; * @param value the rogueVersionId to set * @return this */ @@ -146,7 +146,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_list = 14; * @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 = 14; * @return this */ public SyncRogueCommonActionResultScNotify clearActionResultList() { @@ -164,7 +164,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_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. @@ -178,7 +178,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_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 @@ -193,7 +193,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_list = 14; * @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 = 14; * @param values the actionResultList to add * @return this */ @@ -290,7 +290,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { @@ -299,7 +299,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < actionResultList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 114); output.writeMessageNoTag(actionResultList.get(i)); } } @@ -328,7 +328,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 96: { // rogueVersionId rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; @@ -345,11 +345,11 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 42) { + if (tag != 114) { break; } } - case 42: { + case 114: { // actionResultList tag = input.readRepeatedMessage(actionResultList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonDialogueDataScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonDialogueDataScNotifyOuterClass.java index 6775b22..2f85788 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonDialogueDataScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonDialogueDataScNotifyOuterClass.java @@ -20,7 +20,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 10; + * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 11; */ private final RepeatedMessage dialogueDataList = RepeatedMessage.newEmptyInstance(RogueCommonDialogueDataInfoOuterClass.RogueCommonDialogueDataInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { } /** - * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 10; + * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 11; * @return whether the dialogueDataList field is set */ public boolean hasDialogueDataList() { @@ -43,7 +43,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { } /** - * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 10; + * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 11; * @return this */ public SyncRogueCommonDialogueDataScNotify clearDialogueDataList() { @@ -53,7 +53,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { } /** - * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 10; + * repeated .RogueCommonDialogueDataInfo dialogue_data_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. @@ -68,7 +68,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { } /** - * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 10; + * repeated .RogueCommonDialogueDataInfo dialogue_data_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 @@ -83,7 +83,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { } /** - * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 10; + * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 11; * @param value the dialogueDataList to add * @return this */ @@ -95,7 +95,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { } /** - * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 10; + * repeated .RogueCommonDialogueDataInfo dialogue_data_list = 11; * @param values the dialogueDataList to add * @return this */ @@ -169,7 +169,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < dialogueDataList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeMessageNoTag(dialogueDataList.get(i)); } } @@ -192,7 +192,7 @@ public final class SyncRogueCommonDialogueDataScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 90: { // dialogueDataList tag = input.readRepeatedMessage(dialogueDataList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonDialogueOptionFinishScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonDialogueOptionFinishScNotifyOuterClass.java index 6b60c53..c2c34b3 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonDialogueOptionFinishScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonDialogueOptionFinishScNotifyOuterClass.java @@ -19,22 +19,22 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_unique_id = 3; - */ - private int eventUniqueId; - - /** - * optional uint32 option_id = 7; + * optional uint32 option_id = 9; */ private int optionId; /** - * optional .RogueCommonDialogueOptionInfo result_option_info = 2; + * optional uint32 event_unique_id = 15; + */ + private int eventUniqueId; + + /** + * optional .RogueCommonDialogueOptionInfo result_option_info = 12; */ private final RogueCommonDialogueOptionInfoOuterClass.RogueCommonDialogueOptionInfo resultOptionInfo = RogueCommonDialogueOptionInfoOuterClass.RogueCommonDialogueOptionInfo.newInstance(); /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 12; + * optional .RogueCommonDialogueDataInfo dialogue_data = 13; */ private final RogueCommonDialogueDataInfoOuterClass.RogueCommonDialogueDataInfo dialogueData = RogueCommonDialogueDataInfoOuterClass.RogueCommonDialogueDataInfo.newInstance(); @@ -49,62 +49,25 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional uint32 event_unique_id = 3; - * @return whether the eventUniqueId field is set + * optional uint32 option_id = 9; + * @return whether the optionId field is set */ - public boolean hasEventUniqueId() { + public boolean hasOptionId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 event_unique_id = 3; - * @return this - */ - public SyncRogueCommonDialogueOptionFinishScNotify clearEventUniqueId() { - bitField0_ &= ~0x00000001; - eventUniqueId = 0; - return this; - } - - /** - * optional uint32 event_unique_id = 3; - * @return the eventUniqueId - */ - public int getEventUniqueId() { - return eventUniqueId; - } - - /** - * optional uint32 event_unique_id = 3; - * @param value the eventUniqueId to set - * @return this - */ - public SyncRogueCommonDialogueOptionFinishScNotify setEventUniqueId(final int value) { - bitField0_ |= 0x00000001; - eventUniqueId = value; - return this; - } - - /** - * optional uint32 option_id = 7; - * @return whether the optionId field is set - */ - public boolean hasOptionId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 option_id = 7; + * optional uint32 option_id = 9; * @return this */ public SyncRogueCommonDialogueOptionFinishScNotify clearOptionId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; optionId = 0; return this; } /** - * optional uint32 option_id = 7; + * optional uint32 option_id = 9; * @return the optionId */ public int getOptionId() { @@ -112,18 +75,55 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional uint32 option_id = 7; + * optional uint32 option_id = 9; * @param value the optionId to set * @return this */ public SyncRogueCommonDialogueOptionFinishScNotify setOptionId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; optionId = value; return this; } /** - * optional .RogueCommonDialogueOptionInfo result_option_info = 2; + * optional uint32 event_unique_id = 15; + * @return whether the eventUniqueId field is set + */ + public boolean hasEventUniqueId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 event_unique_id = 15; + * @return this + */ + public SyncRogueCommonDialogueOptionFinishScNotify clearEventUniqueId() { + bitField0_ &= ~0x00000002; + eventUniqueId = 0; + return this; + } + + /** + * optional uint32 event_unique_id = 15; + * @return the eventUniqueId + */ + public int getEventUniqueId() { + return eventUniqueId; + } + + /** + * optional uint32 event_unique_id = 15; + * @param value the eventUniqueId to set + * @return this + */ + public SyncRogueCommonDialogueOptionFinishScNotify setEventUniqueId(final int value) { + bitField0_ |= 0x00000002; + eventUniqueId = value; + return this; + } + + /** + * optional .RogueCommonDialogueOptionInfo result_option_info = 12; * @return whether the resultOptionInfo field is set */ public boolean hasResultOptionInfo() { @@ -131,7 +131,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueOptionInfo result_option_info = 2; + * optional .RogueCommonDialogueOptionInfo result_option_info = 12; * @return this */ public SyncRogueCommonDialogueOptionFinishScNotify clearResultOptionInfo() { @@ -141,7 +141,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueOptionInfo result_option_info = 2; + * optional .RogueCommonDialogueOptionInfo result_option_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. @@ -156,7 +156,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueOptionInfo result_option_info = 2; + * optional .RogueCommonDialogueOptionInfo result_option_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 @@ -171,7 +171,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueOptionInfo result_option_info = 2; + * optional .RogueCommonDialogueOptionInfo result_option_info = 12; * @param value the resultOptionInfo to set * @return this */ @@ -183,7 +183,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 12; + * optional .RogueCommonDialogueDataInfo dialogue_data = 13; * @return whether the dialogueData field is set */ public boolean hasDialogueData() { @@ -191,7 +191,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 12; + * optional .RogueCommonDialogueDataInfo dialogue_data = 13; * @return this */ public SyncRogueCommonDialogueOptionFinishScNotify clearDialogueData() { @@ -201,7 +201,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 12; + * optional .RogueCommonDialogueDataInfo dialogue_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. @@ -215,7 +215,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 12; + * optional .RogueCommonDialogueDataInfo dialogue_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 @@ -230,7 +230,7 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } /** - * optional .RogueCommonDialogueDataInfo dialogue_data = 12; + * optional .RogueCommonDialogueDataInfo dialogue_data = 13; * @param value the dialogueData to set * @return this */ @@ -247,8 +247,8 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eventUniqueId = other.eventUniqueId; optionId = other.optionId; + eventUniqueId = other.eventUniqueId; resultOptionInfo.copyFrom(other.resultOptionInfo); dialogueData.copyFrom(other.dialogueData); } @@ -262,12 +262,12 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasEventUniqueId()) { - setEventUniqueId(other.eventUniqueId); - } if (other.hasOptionId()) { setOptionId(other.optionId); } + if (other.hasEventUniqueId()) { + setEventUniqueId(other.eventUniqueId); + } if (other.hasResultOptionInfo()) { getMutableResultOptionInfo().mergeFrom(other.resultOptionInfo); } @@ -284,8 +284,8 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - eventUniqueId = 0; optionId = 0; + eventUniqueId = 0; resultOptionInfo.clear(); dialogueData.clear(); return this; @@ -313,8 +313,8 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } SyncRogueCommonDialogueOptionFinishScNotify other = (SyncRogueCommonDialogueOptionFinishScNotify) o; return bitField0_ == other.bitField0_ - && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId) && (!hasOptionId() || optionId == other.optionId) + && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId) && (!hasResultOptionInfo() || resultOptionInfo.equals(other.resultOptionInfo)) && (!hasDialogueData() || dialogueData.equals(other.dialogueData)); } @@ -322,19 +322,19 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(eventUniqueId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(optionId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(eventUniqueId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(resultOptionInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 106); output.writeMessageNoTag(dialogueData); } } @@ -343,10 +343,10 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(optionId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(optionId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(resultOptionInfo); @@ -365,34 +365,34 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // eventUniqueId - eventUniqueId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 72: { // optionId optionId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 120) { break; } } - case 18: { - // resultOptionInfo - input.readMessage(resultOptionInfo); - bitField0_ |= 0x00000004; + case 120: { + // eventUniqueId + eventUniqueId = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 98) { break; } } case 98: { + // resultOptionInfo + input.readMessage(resultOptionInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { // dialogueData input.readMessage(dialogueData); bitField0_ |= 0x00000008; @@ -419,10 +419,10 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId); + output.writeUInt32(FieldNames.optionId, optionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.optionId, optionId); + output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.resultOptionInfo, resultOptionInfo); @@ -441,11 +441,11 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2091680134: - case -157385500: { - if (input.isAtField(FieldNames.eventUniqueId)) { + case -79017872: + case 1845434661: { + if (input.isAtField(FieldNames.optionId)) { if (!input.trySkipNullValue()) { - eventUniqueId = input.readUInt32(); + optionId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -453,11 +453,11 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { } break; } - case -79017872: - case 1845434661: { - if (input.isAtField(FieldNames.optionId)) { + case 2091680134: + case -157385500: { + if (input.isAtField(FieldNames.eventUniqueId)) { if (!input.trySkipNullValue()) { - optionId = input.readUInt32(); + eventUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -544,10 +544,10 @@ public final class SyncRogueCommonDialogueOptionFinishScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id"); - static final FieldName optionId = FieldName.forField("optionId", "option_id"); + static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id"); + static final FieldName resultOptionInfo = FieldName.forField("resultOptionInfo", "result_option_info"); static final FieldName dialogueData = FieldName.forField("dialogueData", "dialogue_data"); diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java index b3a24c8..d848f4e 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 = 12; */ private int rogueVersionId; /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_pending_action = 15; */ 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 = 12; * @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 = 12; * @return this */ public SyncRogueCommonPendingActionScNotify clearRogueVersionId() { @@ -57,7 +57,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 11; + * optional uint32 rogue_version_id = 12; * @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 = 12; * @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 = 15; * @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 = 15; * @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 = 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 SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_pending_action = 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 SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_pending_action = 15; * @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) 96); output.writeUInt32NoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 122); output.writeMessageNoTag(rogueCommonPendingAction); } } @@ -232,16 +232,16 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 96: { // rogueVersionId rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 122) { break; } } - case 58: { + case 122: { // 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..8701007 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 = 2; */ 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 = 2; * @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 = 2; * @return this */ public SyncRogueFinishScNotify clearFinishInfo() { @@ -52,7 +52,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .RogueFinishInfo finish_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 SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .RogueFinishInfo finish_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 SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .RogueFinishInfo finish_info = 2; * @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) 18); output.writeMessageNoTag(finishInfo); } } @@ -172,7 +172,7 @@ public final class SyncRogueFinishScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 18: { // 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 c2c1550..5f150f5 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 = 6; + * optional uint32 map_id = 1; */ private int mapId; /** - * optional .RogueRoom cur_room = 8; + * optional .RogueRoom cur_room = 7; */ private final RogueRoomOuterClass.RogueRoom curRoom = RogueRoomOuterClass.RogueRoom.newInstance(); @@ -39,7 +39,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 6; + * optional uint32 map_id = 1; * @return whether the mapId field is set */ public boolean hasMapId() { @@ -47,7 +47,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 6; + * optional uint32 map_id = 1; * @return this */ public SyncRogueMapRoomScNotify clearMapId() { @@ -57,7 +57,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 6; + * optional uint32 map_id = 1; * @return the mapId */ public int getMapId() { @@ -65,7 +65,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 6; + * optional uint32 map_id = 1; * @param value the mapId to set * @return this */ @@ -76,7 +76,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 8; + * optional .RogueRoom cur_room = 7; * @return whether the curRoom field is set */ public boolean hasCurRoom() { @@ -84,7 +84,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 8; + * optional .RogueRoom cur_room = 7; * @return this */ public SyncRogueMapRoomScNotify clearCurRoom() { @@ -94,7 +94,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 8; + * optional .RogueRoom cur_room = 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 SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 8; + * optional .RogueRoom cur_room = 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 SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 8; + * optional .RogueRoom cur_room = 7; * @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) 48); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(mapId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); output.writeMessageNoTag(curRoom); } } @@ -226,16 +226,16 @@ public final class SyncRogueMapRoomScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 8: { // mapId mapId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 58) { break; } } - case 66: { + case 58: { // 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 92a08a1..0731ff5 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 = 3; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 8; */ private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItemInfo = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 8; * @return whether the rogueVirtualItemInfo field is set */ public boolean hasRogueVirtualItemInfo() { @@ -42,7 +42,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 8; * @return this */ public SyncRogueVirtualItemInfoScNotify clearRogueVirtualItemInfo() { @@ -52,7 +52,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; + * optional .RogueVirtualItemInfo rogue_virtual_item_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 SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; + * optional .RogueVirtualItemInfo rogue_virtual_item_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 SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 8; * @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) 26); + output.writeRawByte((byte) 66); output.writeMessageNoTag(rogueVirtualItemInfo); } } @@ -173,7 +173,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 66: { // rogueVirtualItemInfo input.readMessage(rogueVirtualItemInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java index 6e0017a..71cd523 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 = 5; + * optional uint32 group_id = 10; */ private int groupId; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; */ private int retcode; /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 13; + * 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 = 5; + * 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 = 5; + * optional uint32 group_id = 10; * @return this */ public TakeChallengeRewardScRsp clearGroupId() { @@ -63,7 +63,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 10; * @return the groupId */ public int getGroupId() { @@ -71,7 +71,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 10; * @param value the groupId to set * @return this */ @@ -82,7 +82,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -90,7 +90,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; * @return this */ public TakeChallengeRewardScRsp clearRetcode() { @@ -100,7 +100,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -108,7 +108,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 13; + * 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 = 13; + * repeated .TakenChallengeRewardInfo taken_reward_list = 5; * @return this */ public TakeChallengeRewardScRsp clearTakenRewardList() { @@ -137,7 +137,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 13; + * 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 = 13; + * 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 = 13; + * 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 = 13; + * 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) 40); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < takenRewardList.length(); i++) { - output.writeRawByte((byte) 106); + 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 40: { + case 80: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 42) { break; } } - case 106: { + 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 e7e2089..e8c146f 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class TakeMailAttachmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 optional_reward_id = 12; + * optional uint32 optional_reward_id = 5; */ private int optionalRewardId; @@ -40,7 +40,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 12; + * optional uint32 optional_reward_id = 5; * @return whether the optionalRewardId field is set */ public boolean hasOptionalRewardId() { @@ -48,7 +48,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 12; + * optional uint32 optional_reward_id = 5; * @return this */ public TakeMailAttachmentCsReq clearOptionalRewardId() { @@ -58,7 +58,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 12; + * optional uint32 optional_reward_id = 5; * @return the optionalRewardId */ public int getOptionalRewardId() { @@ -66,7 +66,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 12; + * optional uint32 optional_reward_id = 5; * @param value the optionalRewardId to set * @return this */ @@ -210,7 +210,7 @@ public final class TakeMailAttachmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(optionalRewardId); } if ((bitField0_ & 0x00000002) != 0) { @@ -240,7 +240,7 @@ public final class TakeMailAttachmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 40: { // optionalRewardId optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java index 91803b0..95f3939 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 = 15; */ private int retcode; /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 14; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_id_list = 12; */ private final RepeatedInt succMailIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @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 = 15; * @return this */ public TakeMailAttachmentScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 14; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -90,7 +90,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 14; * @return this */ public TakeMailAttachmentScRsp clearAttachment() { @@ -100,7 +100,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 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. @@ -114,7 +114,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 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 @@ -128,7 +128,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 15; + * optional .ItemList attachment = 14; * @param value the attachment to set * @return this */ @@ -139,7 +139,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_id_list = 12; * @return whether the succMailIdList field is set */ public boolean hasSuccMailIdList() { @@ -147,7 +147,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_id_list = 12; * @return this */ public TakeMailAttachmentScRsp clearSuccMailIdList() { @@ -157,7 +157,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_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. @@ -171,7 +171,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_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 @@ -185,7 +185,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_id_list = 12; * @param value the succMailIdList to add * @return this */ @@ -196,7 +196,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_id_list = 12; * @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) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 114); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < succMailIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(succMailIdList.array()[i]); } } @@ -316,25 +316,25 @@ public final class TakeMailAttachmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { + case 114: { // attachment input.readMessage(attachment); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 98) { break; } } - case 106: { + case 98: { // succMailIdList [packed=true] input.readPackedUInt32(succMailIdList, tag); bitField0_ |= 0x00000004; @@ -353,7 +353,7 @@ public final class TakeMailAttachmentScRspOuterClass { tag = input.readTag(); break; } - case 104: { + case 96: { // 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 4d9f978..1052b01 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class TakeOffEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 5; */ private int avatarId; @@ -34,7 +34,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 5; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -42,7 +42,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 5; * @return this */ public TakeOffEquipmentCsReq clearAvatarId() { @@ -52,7 +52,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 5; * @return the avatarId */ public int getAvatarId() { @@ -60,7 +60,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 5; * @param value the avatarId to set * @return this */ @@ -129,7 +129,7 @@ public final class TakeOffEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(avatarId); } } @@ -150,7 +150,7 @@ public final class TakeOffEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 40: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java index ced8e23..8854040 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class TakeOffRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 12; */ private int avatarId; /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_list = 15; */ private final RepeatedInt slotList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 12; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -48,7 +48,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 12; * @return this */ public TakeOffRelicCsReq clearAvatarId() { @@ -58,7 +58,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 12; * @return the avatarId */ public int getAvatarId() { @@ -66,7 +66,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 12; * @param value the avatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_list = 15; * @return whether the slotList field is set */ public boolean hasSlotList() { @@ -85,7 +85,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_list = 15; * @return this */ public TakeOffRelicCsReq clearSlotList() { @@ -95,7 +95,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_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 TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_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 TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_list = 15; * @param value the slotList to add * @return this */ @@ -134,7 +134,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_list = 15; * @param values the slotList to add * @return this */ @@ -210,12 +210,12 @@ public final class TakeOffRelicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < slotList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(slotList.array()[i]); } } @@ -240,16 +240,16 @@ public final class TakeOffRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 96: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 122) { break; } } - case 42: { + case 122: { // slotList [packed=true] input.readPackedUInt32(slotList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class TakeOffRelicCsReqOuterClass { tag = input.readTag(); break; } - case 40: { + case 120: { // slotList [packed=false] tag = input.readRepeatedUInt32(slotList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java index c1a0647..ac79753 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 base_avatar_id = 7; - */ - private int baseAvatarId; - - /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 1; */ private int promotion; + /** + * optional uint32 base_avatar_id = 2; + */ + private int baseAvatarId; + private TakePromotionRewardCsReq() { } @@ -39,62 +39,25 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; - * @return whether the baseAvatarId field is set + * optional uint32 promotion = 1; + * @return whether the promotion field is set */ - public boolean hasBaseAvatarId() { + public boolean hasPromotion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 base_avatar_id = 7; - * @return this - */ - public TakePromotionRewardCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000001; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 7; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 7; - * @param value the baseAvatarId to set - * @return this - */ - public TakePromotionRewardCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000001; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 promotion = 15; - * @return whether the promotion field is set - */ - public boolean hasPromotion() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 1; * @return this */ public TakePromotionRewardCsReq clearPromotion() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; promotion = 0; return this; } /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 1; * @return the promotion */ public int getPromotion() { @@ -102,23 +65,60 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 1; * @param value the promotion to set * @return this */ public TakePromotionRewardCsReq setPromotion(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; promotion = value; return this; } + /** + * optional uint32 base_avatar_id = 2; + * @return whether the baseAvatarId field is set + */ + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 base_avatar_id = 2; + * @return this + */ + public TakePromotionRewardCsReq clearBaseAvatarId() { + bitField0_ &= ~0x00000002; + baseAvatarId = 0; + return this; + } + + /** + * optional uint32 base_avatar_id = 2; + * @return the baseAvatarId + */ + public int getBaseAvatarId() { + return baseAvatarId; + } + + /** + * optional uint32 base_avatar_id = 2; + * @param value the baseAvatarId to set + * @return this + */ + public TakePromotionRewardCsReq setBaseAvatarId(final int value) { + bitField0_ |= 0x00000002; + baseAvatarId = value; + return this; + } + @Override public TakePromotionRewardCsReq copyFrom(final TakePromotionRewardCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - baseAvatarId = other.baseAvatarId; promotion = other.promotion; + baseAvatarId = other.baseAvatarId; } return this; } @@ -129,12 +129,12 @@ public final class TakePromotionRewardCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasPromotion()) { setPromotion(other.promotion); } + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); + } return this; } @@ -145,8 +145,8 @@ public final class TakePromotionRewardCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - baseAvatarId = 0; promotion = 0; + baseAvatarId = 0; return this; } @@ -170,19 +170,19 @@ public final class TakePromotionRewardCsReqOuterClass { } TakePromotionRewardCsReq other = (TakePromotionRewardCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasPromotion() || promotion == other.promotion); + && (!hasPromotion() || promotion == other.promotion) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(baseAvatarId); } } @@ -190,10 +190,10 @@ public final class TakePromotionRewardCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } return size; } @@ -205,18 +205,18 @@ public final class TakePromotionRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 8: { + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 16) { break; } } - case 120: { - // promotion - promotion = input.readUInt32(); + case 16: { + // baseAvatarId + baseAvatarId = 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.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class TakePromotionRewardCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class TakePromotionRewardCsReqOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class TakePromotionRewardCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName promotion = FieldName.forField("promotion"); + + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java index af3c4dd..825f154 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 = 9; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional .ItemList reward_list = 1; + * optional .ItemList reward_list = 9; */ private final ItemListOuterClass.ItemList rewardList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 4; * @return this */ public TakePromotionRewardScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 1; + * optional .ItemList reward_list = 9; * @return whether the rewardList field is set */ public boolean hasRewardList() { @@ -84,7 +84,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 1; + * optional .ItemList reward_list = 9; * @return this */ public TakePromotionRewardScRsp clearRewardList() { @@ -94,7 +94,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 1; + * optional .ItemList reward_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 TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 1; + * optional .ItemList reward_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 TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 1; + * optional .ItemList reward_list = 9; * @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) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 74); output.writeMessageNoTag(rewardList); } } @@ -226,16 +226,16 @@ public final class TakePromotionRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 74) { break; } } - case 10: { + case 74: { // 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 d1b0504..5b8c46c 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 = 11; + * optional uint32 star_count = 13; */ private int starCount; /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 2; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 11; + * optional uint32 star_count = 13; * @return whether the starCount field is set */ public boolean hasStarCount() { @@ -47,7 +47,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 11; + * optional uint32 star_count = 13; * @return this */ public TakenChallengeRewardInfo clearStarCount() { @@ -57,7 +57,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 11; + * optional uint32 star_count = 13; * @return the starCount */ public int getStarCount() { @@ -65,7 +65,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 11; + * optional uint32 star_count = 13; * @param value the starCount to set * @return this */ @@ -76,7 +76,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 2; * @return whether the reward field is set */ public boolean hasReward() { @@ -84,7 +84,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 2; * @return this */ public TakenChallengeRewardInfo clearReward() { @@ -94,7 +94,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 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 TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 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 TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 1; + * optional .ItemList reward = 2; * @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) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(starCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(reward); } } @@ -226,16 +226,16 @@ public final class TakenChallengeRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 104: { // starCount starCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { + case 18: { // reward input.readMessage(reward); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinInfoOuterClass.java index 201e567..1ce666e 100644 --- a/src/generated/main/emu/lunarcore/proto/TextJoinInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TextJoinInfoOuterClass.java @@ -19,12 +19,16 @@ public final class TextJoinInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 text_item_id = 7; + * 
+     *  could be 4, TODO: check
+     *
+ * + * optional uint32 text_item_id = 11; */ private int textItemId; /** - * optional uint32 text_item_config_id = 10; + * optional uint32 text_item_config_id = 13; */ private int textItemConfigId; @@ -39,7 +43,11 @@ public final class TextJoinInfoOuterClass { } /** - * optional uint32 text_item_id = 7; + * 
+     *  could be 4, TODO: check
+     *
+ * + * optional uint32 text_item_id = 11; * @return whether the textItemId field is set */ public boolean hasTextItemId() { @@ -47,7 +55,11 @@ public final class TextJoinInfoOuterClass { } /** - * optional uint32 text_item_id = 7; + * 
+     *  could be 4, TODO: check
+     *
+ * + * optional uint32 text_item_id = 11; * @return this */ public TextJoinInfo clearTextItemId() { @@ -57,7 +69,11 @@ public final class TextJoinInfoOuterClass { } /** - * optional uint32 text_item_id = 7; + * 
+     *  could be 4, TODO: check
+     *
+ * + * optional uint32 text_item_id = 11; * @return the textItemId */ public int getTextItemId() { @@ -65,7 +81,11 @@ public final class TextJoinInfoOuterClass { } /** - * optional uint32 text_item_id = 7; + * 
+     *  could be 4, TODO: check
+     *
+ * + * optional uint32 text_item_id = 11; * @param value the textItemId to set * @return this */ @@ -76,7 +96,7 @@ public final class TextJoinInfoOuterClass { } /** - * optional uint32 text_item_config_id = 10; + * optional uint32 text_item_config_id = 13; * @return whether the textItemConfigId field is set */ public boolean hasTextItemConfigId() { @@ -84,7 +104,7 @@ public final class TextJoinInfoOuterClass { } /** - * optional uint32 text_item_config_id = 10; + * optional uint32 text_item_config_id = 13; * @return this */ public TextJoinInfo clearTextItemConfigId() { @@ -94,7 +114,7 @@ public final class TextJoinInfoOuterClass { } /** - * optional uint32 text_item_config_id = 10; + * optional uint32 text_item_config_id = 13; * @return the textItemConfigId */ public int getTextItemConfigId() { @@ -102,7 +122,7 @@ public final class TextJoinInfoOuterClass { } /** - * optional uint32 text_item_config_id = 10; + * optional uint32 text_item_config_id = 13; * @param value the textItemConfigId to set * @return this */ @@ -177,11 +197,11 @@ public final class TextJoinInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(textItemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(textItemConfigId); } } @@ -205,16 +225,16 @@ public final class TextJoinInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 88: { // textItemId textItemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 104) { break; } } - case 80: { + case 104: { // textItemConfigId textItemConfigId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java index 52b4a23..3af9920 100644 --- a/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class TextJoinQueryCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 text_join_id_list = 8; + * repeated uint32 text_join_id_list = 11; */ private final RepeatedInt textJoinIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 8; + * repeated uint32 text_join_id_list = 11; * @return whether the textJoinIdList field is set */ public boolean hasTextJoinIdList() { @@ -43,7 +43,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 8; + * repeated uint32 text_join_id_list = 11; * @return this */ public TextJoinQueryCsReq clearTextJoinIdList() { @@ -53,7 +53,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 8; + * repeated uint32 text_join_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. @@ -67,7 +67,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 8; + * repeated uint32 text_join_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 @@ -81,7 +81,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 8; + * repeated uint32 text_join_id_list = 11; * @param value the textJoinIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 8; + * repeated uint32 text_join_id_list = 11; * @param values the textJoinIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class TextJoinQueryCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < textJoinIdList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(textJoinIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class TextJoinQueryCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 90: { // textJoinIdList [packed=true] input.readPackedUInt32(textJoinIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class TextJoinQueryCsReqOuterClass { tag = input.readTag(); break; } - case 64: { + case 88: { // textJoinIdList [packed=false] tag = input.readRepeatedUInt32(textJoinIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java index bbc1b96..a2ac986 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 = 3; + * optional uint32 retcode = 10; */ private int retcode; /** - * repeated .TextJoinInfo text_join_list = 10; + * repeated .TextJoinInfo text_join_list = 1; */ private final RepeatedMessage textJoinList = RepeatedMessage.newEmptyInstance(TextJoinInfoOuterClass.TextJoinInfo.getFactory()); @@ -40,7 +40,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 3; + * 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 = 3; + * optional uint32 retcode = 10; * @return this */ public TextJoinQueryScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 3; + * 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 = 10; + * repeated .TextJoinInfo text_join_list = 1; * @return whether the textJoinList field is set */ public boolean hasTextJoinList() { @@ -85,7 +85,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 10; + * repeated .TextJoinInfo text_join_list = 1; * @return this */ public TextJoinQueryScRsp clearTextJoinList() { @@ -95,7 +95,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 10; + * repeated .TextJoinInfo text_join_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 TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 10; + * repeated .TextJoinInfo text_join_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 TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 10; + * repeated .TextJoinInfo text_join_list = 1; * @param value the textJoinList to add * @return this */ @@ -134,7 +134,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 10; + * repeated .TextJoinInfo text_join_list = 1; * @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) 24); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < textJoinList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 10); output.writeMessageNoTag(textJoinList.get(i)); } } @@ -241,16 +241,16 @@ public final class TextJoinQueryScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 10) { break; } } - case 82: { + case 10: { // textJoinList tag = input.readRepeatedMessage(textJoinList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java index 9a13229..756b945 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java @@ -21,17 +21,17 @@ public final class UnlockBackGroundMusicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated uint32 unlocked_ids = 12; + * repeated uint32 unlocked_ids = 11; */ private final RepeatedInt unlockedIds = RepeatedInt.newEmptyInstance(); /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 2; */ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory()); @@ -46,7 +46,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -54,7 +54,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return this */ public UnlockBackGroundMusicScRsp clearRetcode() { @@ -64,7 +64,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -72,7 +72,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -83,7 +83,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 12; + * repeated uint32 unlocked_ids = 11; * @return whether the unlockedIds field is set */ public boolean hasUnlockedIds() { @@ -91,7 +91,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 12; + * repeated uint32 unlocked_ids = 11; * @return this */ public UnlockBackGroundMusicScRsp clearUnlockedIds() { @@ -101,7 +101,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 12; + * repeated uint32 unlocked_ids = 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. @@ -115,7 +115,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 12; + * repeated uint32 unlocked_ids = 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 @@ -129,7 +129,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 12; + * repeated uint32 unlocked_ids = 11; * @param value the unlockedIds to add * @return this */ @@ -140,7 +140,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 12; + * repeated uint32 unlocked_ids = 11; * @param values the unlockedIds to add * @return this */ @@ -151,7 +151,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 2; * @return whether the musicList field is set */ public boolean hasMusicList() { @@ -159,7 +159,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 2; * @return this */ public UnlockBackGroundMusicScRsp clearMusicList() { @@ -169,7 +169,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * 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. @@ -183,7 +183,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * 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 @@ -197,7 +197,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 2; * @param value the musicList to add * @return this */ @@ -209,7 +209,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 2; * @param values the musicList to add * @return this */ @@ -293,18 +293,18 @@ public final class UnlockBackGroundMusicScRspOuterClass { @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 < unlockedIds.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(unlockedIds.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < musicList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 18); output.writeMessageNoTag(musicList.get(i)); } } @@ -332,25 +332,25 @@ public final class UnlockBackGroundMusicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 90) { break; } } - case 98: { + case 90: { // unlockedIds [packed=true] input.readPackedUInt32(unlockedIds, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 18) { break; } } - case 26: { + case 18: { // musicList tag = input.readRepeatedMessage(musicList, tag); bitField0_ |= 0x00000004; @@ -368,7 +368,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { tag = input.readTag(); break; } - case 96: { + case 88: { // unlockedIds [packed=false] tag = input.readRepeatedUInt32(unlockedIds, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockChatBubbleScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockChatBubbleScNotifyOuterClass.java index 58f47f0..d0815b1 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 = 14; + * optional uint32 bubble_id = 1; */ private int bubbleId; @@ -34,7 +34,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 14; + * optional uint32 bubble_id = 1; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 14; + * optional uint32 bubble_id = 1; * @return this */ public UnlockChatBubbleScNotify clearBubbleId() { @@ -52,7 +52,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 14; + * optional uint32 bubble_id = 1; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 14; + * optional uint32 bubble_id = 1; * @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) 112); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 8: { // bubbleId bubbleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java index f94891c..958e9f0 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 = 10; + * optional uint32 theme_id = 5; */ private int themeId; @@ -34,7 +34,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 10; + * optional uint32 theme_id = 5; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 10; + * optional uint32 theme_id = 5; * @return this */ public UnlockPhoneThemeScNotify clearThemeId() { @@ -52,7 +52,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 10; + * optional uint32 theme_id = 5; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 10; + * optional uint32 theme_id = 5; * @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) 80); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 40: { // 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 e5d51ae..f017a21 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 = 12; + * optional uint32 point_id = 10; */ private int pointId; /** - * optional uint32 level = 14; + * optional uint32 level = 13; */ private int level; /** - * repeated .ItemCost item_list = 6; + * 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 = 12; + * optional uint32 point_id = 10; * @return whether the pointId field is set */ public boolean hasPointId() { @@ -53,7 +53,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 12; + * optional uint32 point_id = 10; * @return this */ public UnlockSkilltreeCsReq clearPointId() { @@ -63,7 +63,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 12; + * optional uint32 point_id = 10; * @return the pointId */ public int getPointId() { @@ -71,7 +71,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 12; + * optional uint32 point_id = 10; * @param value the pointId to set * @return this */ @@ -82,7 +82,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 14; + * optional uint32 level = 13; * @return whether the level field is set */ public boolean hasLevel() { @@ -90,7 +90,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 14; + * optional uint32 level = 13; * @return this */ public UnlockSkilltreeCsReq clearLevel() { @@ -100,7 +100,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 14; + * optional uint32 level = 13; * @return the level */ public int getLevel() { @@ -108,7 +108,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 14; + * optional uint32 level = 13; * @param value the level to set * @return this */ @@ -119,7 +119,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 6; + * 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 = 6; + * repeated .ItemCost item_list = 15; * @return this */ public UnlockSkilltreeCsReq clearItemList() { @@ -137,7 +137,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 6; + * 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 = 6; + * 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 = 6; + * 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 = 6; + * 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) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(pointId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 50); + 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 96: { + case 80: { // pointId pointId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // level level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 122) { break; } } - case 50: { + 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 bb893b1..0ec0360 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java @@ -19,20 +19,20 @@ public final class UnlockSkilltreeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 2; - */ - private int level; - - /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 point_id = 15; + * optional uint32 point_id = 9; */ private int pointId; + /** + * optional uint32 level = 14; + */ + private int level; + private UnlockSkilltreeScRsp() { } @@ -44,62 +44,25 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 level = 2; - * @return whether the level field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasLevel() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 level = 2; - * @return this - */ - public UnlockSkilltreeScRsp clearLevel() { - bitField0_ &= ~0x00000001; - level = 0; - return this; - } - - /** - * optional uint32 level = 2; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 2; - * @param value the level to set - * @return this - */ - public UnlockSkilltreeScRsp setLevel(final int value) { - bitField0_ |= 0x00000001; - level = value; - return this; - } - - /** - * optional uint32 retcode = 11; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @return this */ public UnlockSkilltreeScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -107,36 +70,36 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ public UnlockSkilltreeScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 point_id = 15; + * optional uint32 point_id = 9; * @return whether the pointId field is set */ public boolean hasPointId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 point_id = 15; + * optional uint32 point_id = 9; * @return this */ public UnlockSkilltreeScRsp clearPointId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; pointId = 0; return this; } /** - * optional uint32 point_id = 15; + * optional uint32 point_id = 9; * @return the pointId */ public int getPointId() { @@ -144,24 +107,61 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 point_id = 15; + * optional uint32 point_id = 9; * @param value the pointId to set * @return this */ public UnlockSkilltreeScRsp setPointId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; pointId = value; return this; } + /** + * optional uint32 level = 14; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 14; + * @return this + */ + public UnlockSkilltreeScRsp clearLevel() { + bitField0_ &= ~0x00000004; + level = 0; + return this; + } + + /** + * optional uint32 level = 14; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 14; + * @param value the level to set + * @return this + */ + public 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_; - level = other.level; retcode = other.retcode; pointId = other.pointId; + level = other.level; } return this; } @@ -172,15 +172,15 @@ public final class UnlockSkilltreeScRspOuterClass { return this; } cachedSize = -1; - if (other.hasLevel()) { - setLevel(other.level); - } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasPointId()) { setPointId(other.pointId); } + if (other.hasLevel()) { + setLevel(other.level); + } return this; } @@ -191,9 +191,9 @@ public final class UnlockSkilltreeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - level = 0; retcode = 0; pointId = 0; + level = 0; return this; } @@ -217,39 +217,39 @@ public final class UnlockSkilltreeScRspOuterClass { } UnlockSkilltreeScRsp other = (UnlockSkilltreeScRsp) o; return bitField0_ == other.bitField0_ - && (!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) 16); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); output.writeUInt32NoTag(pointId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(level); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } return size; } @@ -261,26 +261,26 @@ public final class UnlockSkilltreeScRspOuterClass { while (true) { switch (tag) { case 16: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 72) { break; } } - case 120: { + case 72: { // pointId pointId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,14 +305,14 @@ public final class UnlockSkilltreeScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.pointId, pointId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } output.endObject(); } @@ -323,22 +323,11 @@ public final class UnlockSkilltreeScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -350,6 +339,17 @@ public final class UnlockSkilltreeScRspOuterClass { if (input.isAtField(FieldNames.pointId)) { if (!input.trySkipNullValue()) { pointId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -410,11 +410,11 @@ public final class UnlockSkilltreeScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName level = FieldName.forField("level"); - static final FieldName retcode = FieldName.forField("retcode"); static final FieldName pointId = FieldName.forField("pointId", "point_id"); + + static final FieldName level = FieldName.forField("level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java index d560849..9bc8483 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 group_id = 8; + * optional uint32 group_id = 11; */ private int groupId; /** - * optional uint32 id = 12; + * optional uint32 id = 15; */ private int id; /** - * optional bool unkbool = 5; + * optional bool unkbool = 14; */ private boolean unkbool; @@ -44,7 +44,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 11; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -52,7 +52,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 11; * @return this */ public UnlockedMusic clearGroupId() { @@ -62,7 +62,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 11; * @return the groupId */ public int getGroupId() { @@ -70,7 +70,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 11; * @param value the groupId to set * @return this */ @@ -81,7 +81,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 12; + * optional uint32 id = 15; * @return whether the id field is set */ public boolean hasId() { @@ -89,7 +89,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 12; + * optional uint32 id = 15; * @return this */ public UnlockedMusic clearId() { @@ -99,7 +99,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 12; + * optional uint32 id = 15; * @return the id */ public int getId() { @@ -107,7 +107,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 12; + * optional uint32 id = 15; * @param value the id to set * @return this */ @@ -118,7 +118,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 5; + * optional bool unkbool = 14; * @return whether the unkbool field is set */ public boolean hasUnkbool() { @@ -126,7 +126,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 5; + * optional bool unkbool = 14; * @return this */ public UnlockedMusic clearUnkbool() { @@ -136,7 +136,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 5; + * optional bool unkbool = 14; * @return the unkbool */ public boolean getUnkbool() { @@ -144,7 +144,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 5; + * optional bool unkbool = 14; * @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) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 112); output.writeBoolNoTag(unkbool); } } @@ -260,25 +260,25 @@ public final class UnlockedMusicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 88: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // id id = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 112) { break; } } - case 40: { + case 112: { // 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 048aed0..47eabe9 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 = 12; + * optional .RotatorEnergyInfo energy_info = 4; */ private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); @@ -34,7 +34,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 12; + * optional .RotatorEnergyInfo energy_info = 4; * @return whether the energyInfo field is set */ public boolean hasEnergyInfo() { @@ -42,7 +42,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 12; + * optional .RotatorEnergyInfo energy_info = 4; * @return this */ public UpdateEnergyScNotify clearEnergyInfo() { @@ -52,7 +52,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 12; + * optional .RotatorEnergyInfo energy_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 UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 12; + * optional .RotatorEnergyInfo energy_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 UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 12; + * optional .RotatorEnergyInfo energy_info = 4; * @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) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(energyInfo); } } @@ -172,7 +172,7 @@ public final class UpdateEnergyScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 34: { // 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 618ee92..c9e2bdd 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 = 4; + * optional .ServerPrefs server_prefs = 8; */ private final ServerPrefsOuterClass.ServerPrefs serverPrefs = ServerPrefsOuterClass.ServerPrefs.newInstance(); @@ -34,7 +34,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 4; + * optional .ServerPrefs server_prefs = 8; * @return whether the serverPrefs field is set */ public boolean hasServerPrefs() { @@ -42,7 +42,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 4; + * optional .ServerPrefs server_prefs = 8; * @return this */ public UpdateServerPrefsDataCsReq clearServerPrefs() { @@ -52,7 +52,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 4; + * optional .ServerPrefs server_prefs = 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 UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 4; + * optional .ServerPrefs server_prefs = 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 UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 4; + * optional .ServerPrefs server_prefs = 8; * @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) 34); + output.writeRawByte((byte) 66); output.writeMessageNoTag(serverPrefs); } } @@ -172,7 +172,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 66: { // 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 4bcf8dd..1e9f457 100644 --- a/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataScRspOuterClass.java @@ -19,15 +19,15 @@ public final class UpdateServerPrefsDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; - */ - private int retcode; - - /** - * optional uint32 server_prefs_id = 7; + * optional uint32 server_prefs_id = 5; */ private int serverPrefsId; + /** + * optional uint32 retcode = 14; + */ + private int retcode; + private UpdateServerPrefsDataScRsp() { } @@ -39,62 +39,25 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 server_prefs_id = 5; + * @return whether the serverPrefsId field is set */ - public boolean hasRetcode() { + public boolean hasServerPrefsId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public UpdateServerPrefsDataScRsp 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 UpdateServerPrefsDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 server_prefs_id = 7; - * @return whether the serverPrefsId field is set - */ - public boolean hasServerPrefsId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 server_prefs_id = 7; + * optional uint32 server_prefs_id = 5; * @return this */ public UpdateServerPrefsDataScRsp clearServerPrefsId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; serverPrefsId = 0; return this; } /** - * optional uint32 server_prefs_id = 7; + * optional uint32 server_prefs_id = 5; * @return the serverPrefsId */ public int getServerPrefsId() { @@ -102,23 +65,60 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * optional uint32 server_prefs_id = 7; + * optional uint32 server_prefs_id = 5; * @param value the serverPrefsId to set * @return this */ public UpdateServerPrefsDataScRsp setServerPrefsId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; serverPrefsId = 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; + * @return this + */ + public UpdateServerPrefsDataScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 14; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 14; + * @param value the retcode to set + * @return this + */ + public UpdateServerPrefsDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public UpdateServerPrefsDataScRsp copyFrom(final UpdateServerPrefsDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; serverPrefsId = other.serverPrefsId; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class UpdateServerPrefsDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasServerPrefsId()) { setServerPrefsId(other.serverPrefsId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class UpdateServerPrefsDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; serverPrefsId = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class UpdateServerPrefsDataScRspOuterClass { } UpdateServerPrefsDataScRsp other = (UpdateServerPrefsDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasServerPrefsId() || serverPrefsId == other.serverPrefsId); + && (!hasServerPrefsId() || serverPrefsId == other.serverPrefsId) + && (!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.writeUInt32NoTag(serverPrefsId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(serverPrefsId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class UpdateServerPrefsDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(serverPrefsId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(serverPrefsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -206,17 +206,17 @@ public final class UpdateServerPrefsDataScRspOuterClass { while (true) { switch (tag) { case 40: { - // retcode - retcode = input.readUInt32(); + // serverPrefsId + serverPrefsId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 112) { break; } } - case 56: { - // serverPrefsId - serverPrefsId = input.readUInt32(); + case 112: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class UpdateServerPrefsDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.serverPrefsId, serverPrefsId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.serverPrefsId, serverPrefsId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public final class UpdateServerPrefsDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 656672552: + case 2077691526: { + if (input.isAtField(FieldNames.serverPrefsId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + serverPrefsId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class UpdateServerPrefsDataScRspOuterClass { } break; } - case 656672552: - case 2077691526: { - if (input.isAtField(FieldNames.serverPrefsId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - serverPrefsId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class UpdateServerPrefsDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName serverPrefsId = FieldName.forField("serverPrefsId", "server_prefs_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java index e5aca59..3a0179f 100644 --- a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java @@ -19,29 +19,29 @@ public final class UseItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  bool LBDJNGPKPMN = 1;
-     *
- * - * optional uint32 optional_reward_id = 5; - */ - private int optionalRewardId; - - /** - * optional uint32 use_item_id = 10; - */ - private int useItemId; - - /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 6; */ private int baseAvatarId; /** - * optional uint32 use_item_count = 15; + * optional uint32 use_item_count = 11; */ private int useItemCount; + /** + * optional uint32 use_item_id = 13; + */ + private int useItemId; + + /** + * 
+     *  bool EFJHLEKNAPG = 7;
+     *
+ * + * optional uint32 optional_reward_id = 15; + */ + private int optionalRewardId; + /** * optional .AvatarType use_avatar_type = 8; */ @@ -58,37 +58,148 @@ public final class UseItemCsReqOuterClass { } /** - * 
-     *  bool LBDJNGPKPMN = 1;
-     *
- * - * optional uint32 optional_reward_id = 5; - * @return whether the optionalRewardId field is set + * optional uint32 base_avatar_id = 6; + * @return whether the baseAvatarId field is set */ - public boolean hasOptionalRewardId() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } + /** + * optional uint32 base_avatar_id = 6; + * @return this + */ + public UseItemCsReq 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 UseItemCsReq setBaseAvatarId(final int value) { + bitField0_ |= 0x00000001; + baseAvatarId = value; + return this; + } + + /** + * optional uint32 use_item_count = 11; + * @return whether the useItemCount field is set + */ + public boolean hasUseItemCount() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 use_item_count = 11; + * @return this + */ + public UseItemCsReq clearUseItemCount() { + bitField0_ &= ~0x00000002; + useItemCount = 0; + return this; + } + + /** + * optional uint32 use_item_count = 11; + * @return the useItemCount + */ + public int getUseItemCount() { + return useItemCount; + } + + /** + * optional uint32 use_item_count = 11; + * @param value the useItemCount to set + * @return this + */ + public UseItemCsReq setUseItemCount(final int value) { + bitField0_ |= 0x00000002; + useItemCount = value; + return this; + } + + /** + * optional uint32 use_item_id = 13; + * @return whether the useItemId field is set + */ + public boolean hasUseItemId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 use_item_id = 13; + * @return this + */ + public UseItemCsReq clearUseItemId() { + bitField0_ &= ~0x00000004; + useItemId = 0; + return this; + } + + /** + * optional uint32 use_item_id = 13; + * @return the useItemId + */ + public int getUseItemId() { + return useItemId; + } + + /** + * optional uint32 use_item_id = 13; + * @param value the useItemId to set + * @return this + */ + public UseItemCsReq setUseItemId(final int value) { + bitField0_ |= 0x00000004; + useItemId = value; + return this; + } + /** * 
-     *  bool LBDJNGPKPMN = 1;
+     *  bool EFJHLEKNAPG = 7;
      *
* - * optional uint32 optional_reward_id = 5; + * optional uint32 optional_reward_id = 15; + * @return whether the optionalRewardId field is set + */ + public boolean hasOptionalRewardId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * 
+     *  bool EFJHLEKNAPG = 7;
+     *
+ * + * optional uint32 optional_reward_id = 15; * @return this */ public UseItemCsReq clearOptionalRewardId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000008; optionalRewardId = 0; return this; } /** * 
-     *  bool LBDJNGPKPMN = 1;
+     *  bool EFJHLEKNAPG = 7;
      *
* - * optional uint32 optional_reward_id = 5; + * optional uint32 optional_reward_id = 15; * @return the optionalRewardId */ public int getOptionalRewardId() { @@ -97,127 +208,16 @@ public final class UseItemCsReqOuterClass { /** * 
-     *  bool LBDJNGPKPMN = 1;
+     *  bool EFJHLEKNAPG = 7;
      *
* - * optional uint32 optional_reward_id = 5; + * optional uint32 optional_reward_id = 15; * @param value the optionalRewardId to set * @return this */ public UseItemCsReq setOptionalRewardId(final int value) { - bitField0_ |= 0x00000001; - optionalRewardId = value; - return this; - } - - /** - * optional uint32 use_item_id = 10; - * @return whether the useItemId field is set - */ - public boolean hasUseItemId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 use_item_id = 10; - * @return this - */ - public UseItemCsReq clearUseItemId() { - bitField0_ &= ~0x00000002; - useItemId = 0; - return this; - } - - /** - * optional uint32 use_item_id = 10; - * @return the useItemId - */ - public int getUseItemId() { - return useItemId; - } - - /** - * optional uint32 use_item_id = 10; - * @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 = 11; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 base_avatar_id = 11; - * @return this - */ - public UseItemCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000004; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 11; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 11; - * @param value the baseAvatarId to set - * @return this - */ - public UseItemCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 use_item_count = 15; - * @return whether the useItemCount field is set - */ - public boolean hasUseItemCount() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 use_item_count = 15; - * @return this - */ - public UseItemCsReq clearUseItemCount() { - bitField0_ &= ~0x00000008; - useItemCount = 0; - return this; - } - - /** - * optional uint32 use_item_count = 15; - * @return the useItemCount - */ - public int getUseItemCount() { - return useItemCount; - } - - /** - * optional uint32 use_item_count = 15; - * @param value the useItemCount to set - * @return this - */ - public UseItemCsReq setUseItemCount(final int value) { bitField0_ |= 0x00000008; - useItemCount = value; + optionalRewardId = value; return this; } @@ -288,10 +288,10 @@ public final class UseItemCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - optionalRewardId = other.optionalRewardId; - useItemId = other.useItemId; baseAvatarId = other.baseAvatarId; useItemCount = other.useItemCount; + useItemId = other.useItemId; + optionalRewardId = other.optionalRewardId; useAvatarType = other.useAvatarType; } return this; @@ -303,18 +303,18 @@ public final class UseItemCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasOptionalRewardId()) { - setOptionalRewardId(other.optionalRewardId); - } - if (other.hasUseItemId()) { - setUseItemId(other.useItemId); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } if (other.hasUseItemCount()) { setUseItemCount(other.useItemCount); } + if (other.hasUseItemId()) { + setUseItemId(other.useItemId); + } + if (other.hasOptionalRewardId()) { + setOptionalRewardId(other.optionalRewardId); + } if (other.hasUseAvatarType()) { setUseAvatarTypeValue(other.useAvatarType); } @@ -328,10 +328,10 @@ public final class UseItemCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - optionalRewardId = 0; - useItemId = 0; baseAvatarId = 0; useItemCount = 0; + useItemId = 0; + optionalRewardId = 0; useAvatarType = 0; return this; } @@ -356,30 +356,30 @@ public final class UseItemCsReqOuterClass { } UseItemCsReq other = (UseItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasOptionalRewardId() || optionalRewardId == other.optionalRewardId) - && (!hasUseItemId() || useItemId == other.useItemId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasUseItemCount() || useItemCount == other.useItemCount) + && (!hasUseItemId() || useItemId == other.useItemId) + && (!hasOptionalRewardId() || optionalRewardId == other.optionalRewardId) && (!hasUseAvatarType() || useAvatarType == other.useAvatarType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(optionalRewardId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(useItemId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(useItemCount); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(useItemId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(useItemCount); + output.writeUInt32NoTag(optionalRewardId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 64); @@ -391,17 +391,17 @@ public final class UseItemCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(optionalRewardId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(optionalRewardId); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(useAvatarType); } @@ -415,27 +415,27 @@ public final class UseItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // optionalRewardId - optionalRewardId = input.readUInt32(); + case 48: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // useItemId - useItemId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 88) { break; } } case 88: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // useItemCount + useItemCount = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // useItemId + useItemId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 120) { @@ -443,8 +443,8 @@ public final class UseItemCsReqOuterClass { } } case 120: { - // useItemCount - useItemCount = input.readUInt32(); + // optionalRewardId + optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 64) { @@ -481,17 +481,17 @@ public final class UseItemCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.optionalRewardId, optionalRewardId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.useItemId, useItemId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.useItemCount, useItemCount); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.useItemId, useItemId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.optionalRewardId, optionalRewardId); + } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.useAvatarType, useAvatarType, AvatarTypeOuterClass.AvatarType.converter()); } @@ -505,36 +505,12 @@ public final class UseItemCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1391749078: - case -1451381236: { - if (input.isAtField(FieldNames.optionalRewardId)) { - if (!input.trySkipNullValue()) { - optionalRewardId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -815318027: - case 1396027151: { - if (input.isAtField(FieldNames.useItemId)) { - if (!input.trySkipNullValue()) { - useItemId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 118022725: case -1756826157: { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -546,6 +522,30 @@ public final class UseItemCsReqOuterClass { if (input.isAtField(FieldNames.useItemCount)) { if (!input.trySkipNullValue()) { useItemCount = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -815318027: + case 1396027151: { + if (input.isAtField(FieldNames.useItemId)) { + if (!input.trySkipNullValue()) { + useItemId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1391749078: + case -1451381236: { + if (input.isAtField(FieldNames.optionalRewardId)) { + if (!input.trySkipNullValue()) { + optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -622,14 +622,14 @@ public final class UseItemCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - 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"); + static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); + + static final FieldName optionalRewardId = FieldName.forField("optionalRewardId", "optional_reward_id"); + static final FieldName useAvatarType = FieldName.forField("useAvatarType", "use_avatar_type"); } } diff --git a/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java index 232011d..36a2dd0 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 retcode = 6; - */ - private int retcode; - - /** - * optional uint32 use_item_id = 7; - */ - private int useItemId; - - /** - * optional uint32 use_item_count = 9; + * optional uint32 use_item_count = 12; */ private int useItemCount; /** - * optional .ItemList return_data = 8; + * optional uint32 use_item_id = 13; + */ + private int useItemId; + + /** + * optional uint32 retcode = 14; + */ + private int retcode; + + /** + * optional .ItemList return_data = 4; */ private final ItemListOuterClass.ItemList returnData = ItemListOuterClass.ItemList.newInstance(); @@ -49,44 +49,44 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set + * optional uint32 use_item_count = 12; + * @return whether the useItemCount field is set */ - public boolean hasRetcode() { + public boolean hasUseItemCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 6; + * optional uint32 use_item_count = 12; * @return this */ - public UseItemScRsp clearRetcode() { + public UseItemScRsp clearUseItemCount() { bitField0_ &= ~0x00000001; - retcode = 0; + useItemCount = 0; return this; } /** - * optional uint32 retcode = 6; - * @return the retcode + * optional uint32 use_item_count = 12; + * @return the useItemCount */ - public int getRetcode() { - return retcode; + public int getUseItemCount() { + return useItemCount; } /** - * optional uint32 retcode = 6; - * @param value the retcode to set + * optional uint32 use_item_count = 12; + * @param value the useItemCount to set * @return this */ - public UseItemScRsp setRetcode(final int value) { + public UseItemScRsp setUseItemCount(final int value) { bitField0_ |= 0x00000001; - retcode = value; + useItemCount = value; return this; } /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 13; * @return whether the useItemId field is set */ public boolean hasUseItemId() { @@ -94,7 +94,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 13; * @return this */ public UseItemScRsp clearUseItemId() { @@ -104,7 +104,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 13; * @return the useItemId */ public int getUseItemId() { @@ -112,7 +112,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 13; * @param value the useItemId to set * @return this */ @@ -123,44 +123,44 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_count = 9; - * @return whether the useItemCount field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasUseItemCount() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 use_item_count = 9; + * optional uint32 retcode = 14; * @return this */ - public UseItemScRsp clearUseItemCount() { + public UseItemScRsp clearRetcode() { bitField0_ &= ~0x00000004; - useItemCount = 0; + retcode = 0; return this; } /** - * optional uint32 use_item_count = 9; - * @return the useItemCount + * optional uint32 retcode = 14; + * @return the retcode */ - public int getUseItemCount() { - return useItemCount; + public int getRetcode() { + return retcode; } /** - * optional uint32 use_item_count = 9; - * @param value the useItemCount to set + * optional uint32 retcode = 14; + * @param value the retcode to set * @return this */ - public UseItemScRsp setUseItemCount(final int value) { + public UseItemScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - useItemCount = value; + retcode = value; return this; } /** - * optional .ItemList return_data = 8; + * 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 = 8; + * optional .ItemList return_data = 4; * @return this */ public UseItemScRsp clearReturnData() { @@ -178,7 +178,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 8; + * 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 = 8; + * 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 = 8; + * optional .ItemList return_data = 4; * @param value the returnData to set * @return this */ @@ -221,9 +221,9 @@ public final class UseItemScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; - useItemId = other.useItemId; useItemCount = other.useItemCount; + useItemId = other.useItemId; + retcode = other.retcode; returnData.copyFrom(other.returnData); } return this; @@ -235,14 +235,14 @@ public final class UseItemScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasUseItemCount()) { + setUseItemCount(other.useItemCount); } if (other.hasUseItemId()) { setUseItemId(other.useItemId); } - if (other.hasUseItemCount()) { - setUseItemCount(other.useItemCount); + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasReturnData()) { getMutableReturnData().mergeFrom(other.returnData); @@ -257,9 +257,9 @@ public final class UseItemScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; - useItemId = 0; useItemCount = 0; + useItemId = 0; + retcode = 0; returnData.clear(); return this; } @@ -285,28 +285,28 @@ public final class UseItemScRspOuterClass { } UseItemScRsp other = (UseItemScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasUseItemId() || useItemId == other.useItemId) && (!hasUseItemCount() || useItemCount == other.useItemCount) + && (!hasUseItemId() || useItemId == other.useItemId) + && (!hasRetcode() || retcode == other.retcode) && (!hasReturnData() || returnData.equals(other.returnData)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(useItemCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(useItemId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(useItemCount); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 34); output.writeMessageNoTag(returnData); } } @@ -315,13 +315,13 @@ public final class UseItemScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnData); @@ -336,34 +336,34 @@ public final class UseItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // retcode - retcode = input.readUInt32(); + case 96: { + // useItemCount + useItemCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 104) { break; } } - case 56: { + case 104: { // useItemId useItemId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { - // useItemCount - useItemCount = input.readUInt32(); + case 112: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 34) { break; } } - case 66: { + case 34: { // returnData input.readMessage(returnData); bitField0_ |= 0x00000008; @@ -390,13 +390,13 @@ public final class UseItemScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.useItemCount, useItemCount); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.useItemId, useItemId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.useItemCount, useItemCount); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.returnData, returnData); @@ -411,10 +411,11 @@ public final class UseItemScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -434,11 +435,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_ |= 0x00000004; } } else { @@ -510,11 +510,11 @@ public final class UseItemScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName useItemCount = FieldName.forField("useItemCount", "use_item_count"); 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 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 057d8c9..e18b9c3 100644 --- a/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java @@ -19,20 +19,20 @@ public final class VectorOuterClass { private static final long serialVersionUID = 0L; /** - * optional sint32 y = 2; + * optional sint32 z = 3; + */ + private int z; + + /** + * optional sint32 y = 5; */ private int y; /** - * optional sint32 x = 6; + * optional sint32 x = 14; */ private int x; - /** - * optional sint32 z = 15; - */ - private int z; - private Vector() { } @@ -44,99 +44,25 @@ public final class VectorOuterClass { } /** - * optional sint32 y = 2; - * @return whether the y field is set + * optional sint32 z = 3; + * @return whether the z field is set */ - public boolean hasY() { + public boolean hasZ() { return (bitField0_ & 0x00000001) != 0; } /** - * optional sint32 y = 2; - * @return this - */ - public Vector clearY() { - bitField0_ &= ~0x00000001; - y = 0; - return this; - } - - /** - * optional sint32 y = 2; - * @return the y - */ - public int getY() { - return y; - } - - /** - * optional sint32 y = 2; - * @param value the y to set - * @return this - */ - public Vector setY(final int value) { - bitField0_ |= 0x00000001; - y = value; - return this; - } - - /** - * optional sint32 x = 6; - * @return whether the x field is set - */ - public boolean hasX() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional sint32 x = 6; - * @return this - */ - public Vector clearX() { - bitField0_ &= ~0x00000002; - x = 0; - return this; - } - - /** - * optional sint32 x = 6; - * @return the x - */ - public int getX() { - return x; - } - - /** - * optional sint32 x = 6; - * @param value the x to set - * @return this - */ - public Vector setX(final int value) { - bitField0_ |= 0x00000002; - x = value; - return this; - } - - /** - * optional sint32 z = 15; - * @return whether the z field is set - */ - public boolean hasZ() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional sint32 z = 15; + * optional sint32 z = 3; * @return this */ public Vector clearZ() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; z = 0; return this; } /** - * optional sint32 z = 15; + * optional sint32 z = 3; * @return the z */ public int getZ() { @@ -144,24 +70,98 @@ public final class VectorOuterClass { } /** - * optional sint32 z = 15; + * optional sint32 z = 3; * @param value the z to set * @return this */ public Vector setZ(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; z = value; return this; } + /** + * optional sint32 y = 5; + * @return whether the y field is set + */ + public boolean hasY() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional sint32 y = 5; + * @return this + */ + public Vector clearY() { + bitField0_ &= ~0x00000002; + y = 0; + return this; + } + + /** + * optional sint32 y = 5; + * @return the y + */ + public int getY() { + return y; + } + + /** + * optional sint32 y = 5; + * @param value the y to set + * @return this + */ + public Vector setY(final int value) { + bitField0_ |= 0x00000002; + y = value; + return this; + } + + /** + * optional sint32 x = 14; + * @return whether the x field is set + */ + public boolean hasX() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional sint32 x = 14; + * @return this + */ + public Vector clearX() { + bitField0_ &= ~0x00000004; + x = 0; + return this; + } + + /** + * optional sint32 x = 14; + * @return the x + */ + public int getX() { + return x; + } + + /** + * optional sint32 x = 14; + * @param value the x to set + * @return this + */ + public Vector setX(final int value) { + bitField0_ |= 0x00000004; + x = value; + return this; + } + @Override public Vector copyFrom(final Vector other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + z = other.z; y = other.y; x = other.x; - z = other.z; } return this; } @@ -172,15 +172,15 @@ public final class VectorOuterClass { return this; } cachedSize = -1; + if (other.hasZ()) { + setZ(other.z); + } if (other.hasY()) { setY(other.y); } if (other.hasX()) { setX(other.x); } - if (other.hasZ()) { - setZ(other.z); - } return this; } @@ -191,9 +191,9 @@ public final class VectorOuterClass { } cachedSize = -1; bitField0_ = 0; + z = 0; y = 0; x = 0; - z = 0; return this; } @@ -217,24 +217,24 @@ public final class VectorOuterClass { } Vector other = (Vector) o; return bitField0_ == other.bitField0_ + && (!hasZ() || z == other.z) && (!hasY() || y == other.y) - && (!hasX() || x == other.x) - && (!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(y); + output.writeRawByte((byte) 24); + output.writeSInt32NoTag(z); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeSInt32NoTag(x); + output.writeRawByte((byte) 40); + output.writeSInt32NoTag(y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeSInt32NoTag(z); + output.writeRawByte((byte) 112); + 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(y); + size += 1 + ProtoSink.computeSInt32SizeNoTag(z); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(x); + 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: { - // y - y = input.readSInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // x - x = input.readSInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 24: { // z z = input.readSInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // y + y = input.readSInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // 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.y, y); + output.writeSInt32(FieldNames.z, z); } if ((bitField0_ & 0x00000002) != 0) { - output.writeSInt32(FieldNames.x, x); + output.writeSInt32(FieldNames.y, y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeSInt32(FieldNames.z, z); + output.writeSInt32(FieldNames.x, x); } output.endObject(); } @@ -323,11 +323,22 @@ public final class VectorOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 122: { + if (input.isAtField(FieldNames.z)) { + if (!input.trySkipNullValue()) { + z = input.readSInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 121: { if (input.isAtField(FieldNames.y)) { if (!input.trySkipNullValue()) { y = input.readSInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -338,17 +349,6 @@ public final class VectorOuterClass { if (input.isAtField(FieldNames.x)) { if (!input.trySkipNullValue()) { x = input.readSInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 122: { - if (input.isAtField(FieldNames.z)) { - if (!input.trySkipNullValue()) { - z = input.readSInt32(); bitField0_ |= 0x00000004; } } else { @@ -408,11 +408,11 @@ public final class VectorOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName z = FieldName.forField("z"); + static final FieldName y = FieldName.forField("y"); static final FieldName x = FieldName.forField("x"); - - static final FieldName z = FieldName.forField("z"); } } } diff --git a/src/main/java/emu/lunarcore/GameConstants.java b/src/main/java/emu/lunarcore/GameConstants.java index ef3a2cc..3c2e8ef 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.4.0"; + public static String VERSION = "2.5.0"; public static final ZoneOffset CURRENT_ZONEOFFSET = ZoneOffset.systemDefault().getRules().getOffset(Instant.now()); public static final int CURRENT_TIMEZONE = CURRENT_ZONEOFFSET.getTotalSeconds() / 3600; diff --git a/src/main/java/emu/lunarcore/data/GameData.java b/src/main/java/emu/lunarcore/data/GameData.java index 3253409..8986b03 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 petExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap contentPackageExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap challengeGroupExcelMap = new Int2ObjectOpenHashMap<>(); diff --git a/src/main/java/emu/lunarcore/data/ResourceLoader.java b/src/main/java/emu/lunarcore/data/ResourceLoader.java index a5e6d7d..dc753f7 100644 --- a/src/main/java/emu/lunarcore/data/ResourceLoader.java +++ b/src/main/java/emu/lunarcore/data/ResourceLoader.java @@ -10,7 +10,6 @@ import java.util.stream.Stream; import emu.lunarcore.data.config.*; import emu.lunarcore.data.config.rogue.RogueDialogueEventConfigInfo; -import emu.lunarcore.data.config.rogue.RogueDialogueEventOptionConfigInfo; import emu.lunarcore.data.config.rogue.RogueNPCConfigInfo; import org.reflections.Reflections; diff --git a/src/main/java/emu/lunarcore/data/config/SummonUnitInfo.java b/src/main/java/emu/lunarcore/data/config/SummonUnitInfo.java index ddde255..69927c7 100644 --- a/src/main/java/emu/lunarcore/data/config/SummonUnitInfo.java +++ b/src/main/java/emu/lunarcore/data/config/SummonUnitInfo.java @@ -28,6 +28,10 @@ public class SummonUnitInfo { } public void buildMazeSkillActions() { + if (TriggerConfig == null) { + return; + } + for (var customTrigger : getCustomTriggers()) { customTrigger.buildMazeSkillActions(); } diff --git a/src/main/java/emu/lunarcore/data/excel/PetExcel.java b/src/main/java/emu/lunarcore/data/excel/PetExcel.java new file mode 100644 index 0000000..c33c979 --- /dev/null +++ b/src/main/java/emu/lunarcore/data/excel/PetExcel.java @@ -0,0 +1,19 @@ +package emu.lunarcore.data.excel; + +import emu.lunarcore.data.GameResource; +import emu.lunarcore.data.ResourceType; +import lombok.Getter; + +@Getter +@ResourceType(name = {"PetConfig.json"}) +public class PetExcel extends GameResource { + private int PetID; + private int PetItemID; + private int SummonUnitID; + + @Override + public int getId() { + return PetID; + } + +} diff --git a/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java index 5c4d853..bcc979d 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 = "MNNPAFJEGJC") + @SerializedName(value = "IOMDAGGIAME") private int RogueBuffGroupID; // RogueBuffGroupID - @SerializedName(value = "KCFPNHGBGIA") + @SerializedName(value = "HLKMFHBOAIA") private IntArrayList RogueBuffTagList; // RogueBuffTagList or RogueBuffGroupList private transient Set rogueBuffList = new HashSet<>(); diff --git a/src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java index c817bc2..1953936 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java @@ -1,7 +1,5 @@ package emu.lunarcore.data.excel; -import emu.lunarcore.data.GameData; -import emu.lunarcore.data.GameDepot; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; import emu.lunarcore.data.config.rogue.RogueNPCConfigInfo; diff --git a/src/main/java/emu/lunarcore/game/enums/AvatarPropertyType.java b/src/main/java/emu/lunarcore/game/enums/AvatarPropertyType.java index a3006a3..ad9d962 100644 --- a/src/main/java/emu/lunarcore/game/enums/AvatarPropertyType.java +++ b/src/main/java/emu/lunarcore/game/enums/AvatarPropertyType.java @@ -63,7 +63,9 @@ public enum AvatarPropertyType { StatusResistanceBase (57), BreakDamageAddedRatio (58), BreakDamageAddedRatioBase (59), - MaxSP (60); + MaxSP (60), + Count (61), + SpecialMaxSP (62); @Getter private int val; diff --git a/src/main/java/emu/lunarcore/game/enums/DialogueEventType.java b/src/main/java/emu/lunarcore/game/enums/DialogueEventType.java index 5b902b4..e10b6b1 100644 --- a/src/main/java/emu/lunarcore/game/enums/DialogueEventType.java +++ b/src/main/java/emu/lunarcore/game/enums/DialogueEventType.java @@ -48,8 +48,7 @@ public enum DialogueEventType { GetDestroyedRogueMiracle(42), ChangeDestroyedRogueMiracleToRogueMiracle(43), DestroyRogueMiracleThenGetRogueMiracle(44), - TriggerDestroyedRogueMiracleSelect(45) - ; + TriggerDestroyedRogueMiracleSelect(45); private final int val; diff --git a/src/main/java/emu/lunarcore/game/enums/ItemMainType.java b/src/main/java/emu/lunarcore/game/enums/ItemMainType.java index 60cc130..b21bbfc 100644 --- a/src/main/java/emu/lunarcore/game/enums/ItemMainType.java +++ b/src/main/java/emu/lunarcore/game/enums/ItemMainType.java @@ -13,7 +13,8 @@ public enum ItemMainType { Usable (5, InventoryTabType.MATERIAL), Material (6, InventoryTabType.MATERIAL), Mission (7, InventoryTabType.MATERIAL), - Display (8); + Display (8), + Pet (9); private int val; private InventoryTabType tabType; diff --git a/src/main/java/emu/lunarcore/game/enums/ItemSubType.java b/src/main/java/emu/lunarcore/game/enums/ItemSubType.java index eb064e0..2e1c142 100644 --- a/src/main/java/emu/lunarcore/game/enums/ItemSubType.java +++ b/src/main/java/emu/lunarcore/game/enums/ItemSubType.java @@ -18,14 +18,22 @@ public enum ItemSubType { MusicAlbum (506), Formula (507), ChatBubble (508), + AvatarSkin (509), PhoneTheme (510), + TravelBrochurePaster (511), + ChessRogueDiceSurface (512), + RogueMedal (513), Material (601), Eidolon (602), MuseumExhibit (603), MuseumStuff (604), + AetherSkill (605), + AetherSpirit (606), + FightFestSkill (607), Mission (701), RelicSetShowOnly (801), - RelicRarityShowOnly (802); + RelicRarityShowOnly (802), + NormalPet (901); private int val; diff --git a/src/main/java/emu/lunarcore/game/enums/ItemUseMethod.java b/src/main/java/emu/lunarcore/game/enums/ItemUseMethod.java index e5390cf..0432ab0 100644 --- a/src/main/java/emu/lunarcore/game/enums/ItemUseMethod.java +++ b/src/main/java/emu/lunarcore/game/enums/ItemUseMethod.java @@ -19,7 +19,10 @@ public enum ItemUseMethod { BPUnlock68 (702), BPUnlock128 (703), BPUpgradeFrom68To128 (704), - AutoConversionItem (801); + AutoConversionItem (801), + TravelBrochureUse (901), + TravelBrochurePasterUse (902), + PetSummonRecall (1001); private int val; diff --git a/src/main/java/emu/lunarcore/game/enums/StageType.java b/src/main/java/emu/lunarcore/game/enums/StageType.java index e9c7659..e5b1860 100644 --- a/src/main/java/emu/lunarcore/game/enums/StageType.java +++ b/src/main/java/emu/lunarcore/game/enums/StageType.java @@ -26,7 +26,16 @@ public enum StageType { Heliobus (20), RogueEndlessActivity (21), StrongChallengeActivity (22), - Challenge (23); + Challenge (23), + TelevisionActivity (24), + EvolveBuildActivity (25), + FeverTimeActivity (26), + ClockParkActivity (27), + RogueRelic (28), + SwordTraining (29), + StarFightActivity (30), + SummonActivity (31), + FightFest (32); @Getter private final int val; diff --git a/src/main/java/emu/lunarcore/game/inventory/Inventory.java b/src/main/java/emu/lunarcore/game/inventory/Inventory.java index 3195959..ce2c2f8 100644 --- a/src/main/java/emu/lunarcore/game/inventory/Inventory.java +++ b/src/main/java/emu/lunarcore/game/inventory/Inventory.java @@ -270,6 +270,9 @@ public class Inventory extends BasePlayerManager { if (subType != ItemSubType.Food) { return null; } + case Pet: + getPlayer().getUnlocks().addPet(item.getItemId()); + return item; default: if (tab == null) { return null; diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java index b5974e4..c229ed0 100644 --- a/src/main/java/emu/lunarcore/game/player/Player.java +++ b/src/main/java/emu/lunarcore/game/player/Player.java @@ -92,6 +92,7 @@ public class Player implements Tickable, Syncable { private int phoneTheme; private int chatBubble; private int currentBgm; + @Setter private int petId; private Map curAvatarPaths; private PlayerGender gender; diff --git a/src/main/java/emu/lunarcore/game/player/PlayerUnlockData.java b/src/main/java/emu/lunarcore/game/player/PlayerUnlockData.java index af7919c..dbcfac1 100644 --- a/src/main/java/emu/lunarcore/game/player/PlayerUnlockData.java +++ b/src/main/java/emu/lunarcore/game/player/PlayerUnlockData.java @@ -27,6 +27,7 @@ public class PlayerUnlockData implements Syncable { private IntSet headIcons; private IntSet chatBubbles; private IntSet phoneThemes; + private IntSet pets; @Deprecated // Morphia only public PlayerUnlockData() {} @@ -87,6 +88,13 @@ public class PlayerUnlockData implements Syncable { return this.phoneThemes; } + public IntSet getPets() { + if (this.pets == null) { + this.pets = new IntOpenHashSet(); + } + return this.pets; + } + public void addHeadIcon(int headIconId) { boolean success = this.getHeadIcons().add(headIconId); @@ -114,6 +122,26 @@ public class PlayerUnlockData implements Syncable { } } + public void addPet(int petItemId) { + // Get pet excel TODO optimize + var excel = GameData.getPetExcelMap().values().stream() + .filter(e -> e.getPetItemID() == petItemId) + .findFirst() + .orElse(null); + + if (excel == null) { + return; + } + + // Add + boolean success = this.getPets().add(excel.getPetID()); + + if (success && this.getOwner().isLoggedIn()) { + // Pet sync packet TODO + this.save(); + } + } + private void sendPacket(BasePacket packet) { this.getOwner().sendPacket(packet); } diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueEventManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueEventManager.java index 5b53e79..89309a3 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueEventManager.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueEventManager.java @@ -4,13 +4,11 @@ import emu.lunarcore.LunarCore; import emu.lunarcore.data.GameData; import emu.lunarcore.game.player.Player; import emu.lunarcore.game.rogue.event.RogueEventResultInfo; -import emu.lunarcore.proto.RogueDialogueEventParamOuterClass.RogueDialogueEventParam; import emu.lunarcore.server.packet.send.PacketSyncRogueCommonDialogueOptionFinishScNotify; import emu.lunarcore.util.Utils; import emu.lunarcore.util.WeightedList; import it.unimi.dsi.fastutil.ints.IntArrayList; import lombok.Getter; -import lombok.Setter; @Getter public class RogueEventManager { diff --git a/src/main/java/emu/lunarcore/server/http/handlers/QueryGatewayHandler.java b/src/main/java/emu/lunarcore/server/http/handlers/QueryGatewayHandler.java index 3978929..c4785c8 100644 --- a/src/main/java/emu/lunarcore/server/http/handlers/QueryGatewayHandler.java +++ b/src/main/java/emu/lunarcore/server/http/handlers/QueryGatewayHandler.java @@ -25,11 +25,10 @@ public class QueryGatewayHandler implements Handler { .setIp(LunarCore.getConfig().getGameServer().getPublicAddress()) .setPort(LunarCore.getConfig().getGameServer().getPublicPort()) .setMsg("Access verification failed. Please check if you have logged in to the correct account and server.") // in case there is some error idk - .setUnk1(true) - .setUnk2(true) - .setUnk3(true) - .setUnk4(true) - .setUnk5(true); + .setEnableVersionUpdate(true) + .setEnableDesignDataBundleVersionUpdate(true) + .setEventTrackingOpen(true) + .setNetworkDiagnostic(true); // Set hotfix urls if (data.assetBundleUrl != null && !data.assetBundleUrl.isBlank()) { diff --git a/src/main/java/emu/lunarcore/server/packet/CmdId.java b/src/main/java/emu/lunarcore/server/packet/CmdId.java index 40a6f98..5674c9e 100644 --- a/src/main/java/emu/lunarcore/server/packet/CmdId.java +++ b/src/main/java/emu/lunarcore/server/packet/CmdId.java @@ -5,1556 +5,1578 @@ public class CmdId { public static final int NONE = 0; // Cmd Ids - public static final int SpringRecoverCsReq = 1488; - public static final int FinishEmotionDialoguePerformanceScRsp = 6341; - public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5673; - public static final int SubmitMonsterResearchActivityMaterialCsReq = 2640; - public static final int EnterAetherDivideSceneCsReq = 4818; - public static final int CommonRogueQueryScRsp = 5668; - public static final int GetRogueShopMiracleInfoCsReq = 5637; - public static final int ApplyFriendCsReq = 2928; - public static final int GetHeartDialInfoScRsp = 6374; - public static final int ComposeLimitNumUpdateNotify = 538; - public static final int GetCurAssistCsReq = 2902; - public static final int ChangeLineupLeaderCsReq = 798; - public static final int FinishQuestCsReq = 964; - public static final int GetAuthkeyScRsp = 91; - public static final int StartAetherDivideChallengeBattleScRsp = 4841; - public static final int FightEnterScRsp = 30074; - public static final int FinishRogueCommonDialogueCsReq = 5694; - public static final int MarkAvatarCsReq = 392; - public static final int StartRogueScRsp = 1837; - public static final int UnlockAvatarSkinScNotify = 324; - public static final int SellItemCsReq = 540; - public static final int RelicAvatarRecommendScRsp = 542; - public static final int SwapLineupScRsp = 764; - public static final int GetChallengeGroupStatisticsCsReq = 1791; - public static final int FinishPerformSectionIdScRsp = 2764; - public static final int SyncLineupNotify = 789; - public static final int UseTreasureDungeonItemScRsp = 4408; - public static final int AcceptMainMissionCsReq = 1282; - public static final int GetWolfBroGameDataCsReq = 6519; - public static final int RogueTournDifficultyCompNotify = 6100; - public static final int JoinLineupCsReq = 758; - public static final int DelSaveRaidScNotify = 2240; - public static final int EvolveBuildReRandomStageCsReq = 7105; - public static final int CurTrialActivityScNotify = 2694; - public static final int SubmitEmotionItemScRsp = 6349; - public static final int UpdateRogueAdventureRoomScoreScRsp = 5642; - public static final int LobbyInviteScRsp = 7353; - public static final int SharePunkLordMonsterCsReq = 3258; - public static final int RogueTournGetArchiveRepositoryCsReq = 6043; - public static final int RogueTournRenameArchiveCsReq = 6048; - public static final int TakeRogueEventHandbookRewardCsReq = 5639; - public static final int GetPlayerReturnMultiDropInfoScRsp = 4658; - public static final int MuseumTakeCollectRewardCsReq = 4347; - public static final int MonopolyGameCreateScNotify = 7080; - public static final int MonopolyGetRafflePoolInfoScRsp = 7065; - public static final int GetActivityScheduleConfigCsReq = 2658; - public static final int DeleteSummonUnitCsReq = 1450; - public static final int RefreshAlleyOrderScRsp = 4762; - public static final int GetCurSceneInfoScRsp = 1441; - public static final int StartCocoonStageScRsp = 1406; - public static final int TreasureDungeonFinishScNotify = 4474; - public static final int StrongChallengeActivityBattleEndScNotify = 6658; - public static final int StartAlleyEventCsReq = 4728; - public static final int ChessRogueCellUpdateNotify = 5412; - public static final int BuyRogueShopMiracleCsReq = 5641; + public static final int SpringRecoverCsReq = 1458; + public static final int FinishEmotionDialoguePerformanceScRsp = 6329; + public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5617; + public static final int SubmitMonsterResearchActivityMaterialCsReq = 2625; + public static final int EnterAetherDivideSceneCsReq = 4868; + public static final int CommonRogueQueryScRsp = 5641; + public static final int GetRogueShopMiracleInfoCsReq = 5643; + public static final int ApplyFriendCsReq = 2939; + public static final int GetHeartDialInfoScRsp = 6306; + public static final int ComposeLimitNumUpdateNotify = 516; + public static final int GetCurAssistCsReq = 2978; + public static final int ChangeLineupLeaderCsReq = 748; + public static final int FinishQuestCsReq = 933; + public static final int GetAuthkeyScRsp = 97; + public static final int StartAetherDivideChallengeBattleScRsp = 4829; + public static final int FightEnterScRsp = 30006; + public static final int FinishRogueCommonDialogueCsReq = 5622; + public static final int MarkAvatarCsReq = 308; + public static final int StartRogueScRsp = 1843; + public static final int UnlockAvatarSkinScNotify = 388; + public static final int SellItemCsReq = 525; + public static final int RelicAvatarRecommendScRsp = 2417; + public static final int SwapLineupScRsp = 733; + public static final int GetChallengeGroupStatisticsCsReq = 1797; + public static final int FinishPerformSectionIdScRsp = 2733; + public static final int SyncLineupNotify = 799; + public static final int UseTreasureDungeonItemScRsp = 4492; + public static final int AcceptMainMissionCsReq = 1284; + public static final int GetWolfBroGameDataCsReq = 6551; + public static final int RogueTournDifficultyCompNotify = 6055; + public static final int JoinLineupCsReq = 756; + public static final int DelSaveRaidScNotify = 2225; + public static final int EvolveBuildReRandomStageCsReq = 7145; + public static final int CurTrialActivityScNotify = 2622; + public static final int SubmitEmotionItemScRsp = 6393; + public static final int UpdateRogueAdventureRoomScoreScRsp = 5640; + public static final int LobbyInviteScRsp = 7356; + public static final int SharePunkLordMonsterCsReq = 3256; + public static final int RogueTournRenameArchiveCsReq = 6044; + public static final int RogueTournGetArchiveRepositoryCsReq = 6082; + public static final int TakeRogueEventHandbookRewardCsReq = 5689; + public static final int GetPlayerReturnMultiDropInfoScRsp = 4656; + public static final int MuseumTakeCollectRewardCsReq = 4381; + public static final int MonopolyGameCreateScNotify = 7012; + public static final int MonopolyGetRafflePoolInfoScRsp = 7070; + public static final int GetActivityScheduleConfigCsReq = 2656; + public static final int DeleteSummonUnitCsReq = 1404; + public static final int RefreshAlleyOrderScRsp = 4798; + public static final int GetCurSceneInfoScRsp = 1429; + public static final int StartCocoonStageScRsp = 1466; + public static final int TreasureDungeonFinishScNotify = 4406; + public static final int StrongChallengeActivityBattleEndScNotify = 6656; + public static final int StartAlleyEventCsReq = 4739; + public static final int ChessRogueCellUpdateNotify = 5498; + public static final int RecallPetScRsp = 7608; + public static final int BuyRogueShopMiracleCsReq = 5629; public static final int EnterRogueEndlessActivityStageScRsp = 6010; - public static final int StartAetherDivideStageBattleCsReq = 4873; - public static final int GetLoginActivityCsReq = 2618; - public static final int StartBoxingClubBattleScRsp = 4249; - public static final int GetWaypointCsReq = 418; - public static final int LeaveRogueScRsp = 1841; - public static final int TravelBrochureSetPageDescStatusScRsp = 6462; - public static final int GetAllSaveRaidScRsp = 2262; - public static final int WolfBroGamePickupBulletScRsp = 6583; - public static final int ClockParkUnlockTalentScRsp = 7249; - public static final int ExchangeStaminaScRsp = 83; - public static final int GetPunkLordBattleRecordScRsp = 3202; - public static final int GetShopListScRsp = 1574; - public static final int LogisticsScoreRewardSyncInfoScNotify = 4780; - public static final int GetStageLineupScRsp = 774; - public static final int UpdateRotaterScNotify = 6848; - public static final int LockRelicCsReq = 591; - public static final int BattlePassInfoNotify = 3018; - public static final int MonopolyMoveCsReq = 7041; - public static final int ReserveStaminaExchangeScRsp = 95; - public static final int MarkItemCsReq = 509; - public static final int MonopolyGameRaiseRatioCsReq = 7038; - public static final int UpdateFloorSavedValueNotify = 1465; - public static final int ExpUpRelicScRsp = 522; - public static final int AlleyShipUnlockScNotify = 4777; - public static final int ChessRogueEnterNextLayerScRsp = 5582; - public static final int SyncRogueFinishScNotify = 1883; - public static final int ChessRogueNousEditDiceCsReq = 5445; - public static final int MonopolyTakePhaseRewardScRsp = 7085; - public static final int EvolveBuildUnlockInfoNotify = 7123; - public static final int GetLevelRewardTakenListCsReq = 8; - public static final int InteractTreasureDungeonGridScRsp = 4448; - public static final int GetRndOptionCsReq = 3418; - public static final int SwordTrainingRestoreGameScRsp = 7468; - public static final int ChessRogueNousDiceUpdateNotify = 5542; - public static final int TakeQuestRewardCsReq = 929; - public static final int SwordTrainingExamResultConfirmCsReq = 7488; - public static final int ChessRoguePickAvatarScRsp = 5441; - public static final int LeaveAetherDivideSceneScRsp = 4837; - public static final int MuseumRandomEventStartScNotify = 4340; - public static final int RemoveStuffFromAreaScRsp = 4341; - public static final int MonopolyScrachRaffleTicketCsReq = 7081; - public static final int SyncRogueCommonVirtualItemInfoScNotify = 5645; - public static final int AetherDivideSpiritExpUpCsReq = 4811; - public static final int GetFirstTalkByPerformanceNpcScRsp = 2157; - public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4222; - public static final int ReviveRogueAvatarCsReq = 1840; - public static final int SetTurnFoodSwitchScRsp = 523; - public static final int TakeTrialActivityRewardScRsp = 2633; - public static final int ClientObjDownloadDataScNotify = 99; - public static final int TakeChallengeRaidRewardScRsp = 2219; - public static final int DoGachaInRollShopCsReq = 6913; - public static final int WolfBroGameUseBulletCsReq = 6557; - public static final int GetMapRotationDataCsReq = 6889; - public static final int LobbyCreateCsReq = 7369; - public static final int AlleyEventEffectNotify = 4764; - public static final int GetCurBattleInfoScRsp = 149; - public static final int GiveUpBoxingClubChallengeScRsp = 4241; - public static final int FightKickOutScNotify = 30037; - public static final int AcceptedPamMissionExpireScRsp = 4074; - public static final int WolfBroGameExplodeMonsterCsReq = 6562; - public static final int TakeRogueEndlessActivityPointRewardScRsp = 6003; - public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5456; - public static final int GetMonopolyDailyReportScRsp = 7052; - public static final int BuyNpcStuffScRsp = 4337; - public static final int GetMissionDataCsReq = 1218; - public static final int ChessRogueFinishCurRoomNotify = 5439; - public static final int TextJoinQueryCsReq = 3829; - public static final int RotateMapScRsp = 6841; - public static final int LeaveChallengeScRsp = 1749; - public static final int TakeRogueAeonLevelRewardCsReq = 1881; - public static final int MonopolyGuessDrawScNotify = 7075; - public static final int MonopolyGameGachaCsReq = 7002; - public static final int SummonPunkLordMonsterScRsp = 3241; - public static final int FinishItemIdCsReq = 2758; - public static final int MuseumRandomEventSelectCsReq = 4308; - public static final int RefreshTriggerByClientCsReq = 1497; - public static final int EnterTreasureDungeonScRsp = 4498; - public static final int CommonRogueUpdateScNotify = 5633; - public static final int MissionGroupWarnScNotify = 1257; - public static final int GetEnteredSceneScRsp = 1444; - public static final int ArchiveWolfBroGameScRsp = 6537; - public static final int SyncTaskScRsp = 1228; - public static final int RogueWorkbenchSelectFuncScRsp = 5660; - public static final int EvolveBuildLeaveScRsp = 7150; - public static final int PickRogueAvatarScRsp = 1891; - public static final int SetFriendMarkCsReq = 2942; - public static final int EnterChallengeNextPhaseScRsp = 1777; - public static final int RogueWorkbenchSelectFuncCsReq = 5644; - public static final int EvolveBuildShopAbilityUpCsReq = 7113; - public static final int MatchThreeSetBirdPosScRsp = 7412; - public static final int RogueModifierSelectCellScRsp = 5358; - public static final int HeliobusUpgradeLevelScRsp = 5898; - public static final int TakeMultipleExpeditionRewardScRsp = 2540; - public static final int MonopolyGuessChooseScRsp = 7087; - public static final int QuitBattleScNotify = 119; - public static final int StartRaidScRsp = 2274; - public static final int RogueModifierStageStartNotify = 5364; - public static final int EnterChallengeNextPhaseCsReq = 1721; - public static final int MonopolyGetRegionProgressCsReq = 7095; - public static final int GetFriendBattleRecordDetailScRsp = 2933; - public static final int ComposeSelectedRelicCsReq = 521; - public static final int GetFriendAssistListScRsp = 2936; - public static final int GetTreasureDungeonActivityDataScRsp = 4457; - public static final int GetPlayerBoardDataScRsp = 2874; - public static final int GetMonopolyDailyReportCsReq = 7030; - public static final int TakeMailAttachmentScRsp = 841; - public static final int SetDisplayAvatarCsReq = 2858; - public static final int ChessRogueQueryAeonDimensionsScRsp = 5576; - public static final int HeliobusSnsLikeCsReq = 5828; - public static final int MatchBoxingClubOpponentScRsp = 4237; - public static final int ArchiveWolfBroGameCsReq = 6529; - public static final int AceAntiCheaterScRsp = 10; - public static final int SyncRogueCommonDialogueDataScNotify = 5684; - public static final int GetAllLineupDataCsReq = 748; - public static final int GetMonopolyMbtiReportRewardScRsp = 7086; - public static final int GetPunkLordDataCsReq = 3222; - public static final int UnlockTutorialGuideScRsp = 1641; - public static final int EnterSceneByServerScNotify = 1434; - public static final int DeleteFriendScRsp = 2998; + public static final int StartAetherDivideStageBattleCsReq = 4817; + public static final int GetLoginActivityCsReq = 2668; + public static final int StartBoxingClubBattleScRsp = 4293; + public static final int GetWaypointCsReq = 468; + public static final int LeaveRogueScRsp = 1829; + public static final int TravelBrochureSetPageDescStatusScRsp = 6498; + public static final int GetAllSaveRaidScRsp = 2298; + public static final int WolfBroGamePickupBulletScRsp = 6582; + public static final int ClockParkUnlockTalentScRsp = 7208; + public static final int ExchangeStaminaScRsp = 82; + public static final int GetPunkLordBattleRecordScRsp = 3278; + public static final int GetShopListScRsp = 1506; + public static final int LogisticsScoreRewardSyncInfoScNotify = 4712; + public static final int GetStageLineupScRsp = 706; + public static final int UpdateRotaterScNotify = 6824; + public static final int LockRelicCsReq = 597; + public static final int BattlePassInfoNotify = 3068; + public static final int MonopolyMoveCsReq = 7029; + public static final int ReserveStaminaExchangeScRsp = 72; + public static final int MarkItemCsReq = 549; + public static final int MonopolyGameRaiseRatioCsReq = 7016; + public static final int UpdateFloorSavedValueNotify = 1470; + public static final int ExpUpRelicScRsp = 534; + public static final int AlleyShipUnlockScNotify = 4709; + public static final int ChessRogueEnterNextLayerScRsp = 5492; + public static final int SyncRogueFinishScNotify = 1882; + public static final int ChessRogueNousEditDiceCsReq = 5459; + public static final int MonopolyTakePhaseRewardScRsp = 7079; + public static final int EvolveBuildUnlockInfoNotify = 7149; + public static final int GetLevelRewardTakenListCsReq = 92; + public static final int InteractTreasureDungeonGridScRsp = 4424; + public static final int GetRndOptionCsReq = 3468; + public static final int SwordTrainingRestoreGameScRsp = 7496; + public static final int ChessRogueNousDiceUpdateNotify = 5508; + public static final int TakeQuestRewardCsReq = 911; + public static final int SwordTrainingExamResultConfirmCsReq = 7464; + public static final int ChessRoguePickAvatarScRsp = 5450; + public static final int LeaveAetherDivideSceneScRsp = 4843; + public static final int MuseumRandomEventStartScNotify = 4325; + public static final int RemoveStuffFromAreaScRsp = 4329; + public static final int MonopolyScrachRaffleTicketCsReq = 7010; + public static final int SyncRogueCommonVirtualItemInfoScNotify = 5685; + public static final int AetherDivideSpiritExpUpCsReq = 4890; + public static final int GetFirstTalkByPerformanceNpcScRsp = 2154; + public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4234; + public static final int ReviveRogueAvatarCsReq = 1825; + public static final int SetTurnFoodSwitchScRsp = 530; + public static final int TakeTrialActivityRewardScRsp = 2631; + public static final int ClientObjDownloadDataScNotify = 61; + public static final int TakeChallengeRaidRewardScRsp = 2251; + public static final int DoGachaInRollShopCsReq = 6912; + public static final int WolfBroGameUseBulletCsReq = 6554; + public static final int GetMapRotationDataCsReq = 6899; + public static final int RogueArcadeRestartCsReq = 7661; + public static final int LobbyCreateCsReq = 7357; + public static final int AlleyEventEffectNotify = 4733; + public static final int GetCurBattleInfoScRsp = 193; + public static final int GiveUpBoxingClubChallengeScRsp = 4229; + public static final int SummonPetCsReq = 7615; + public static final int FightKickOutScNotify = 30043; + public static final int AcceptedPamMissionExpireScRsp = 4006; + public static final int WolfBroGameExplodeMonsterCsReq = 6598; + public static final int TakeRogueEndlessActivityPointRewardScRsp = 6007; + public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5417; + public static final int GetMonopolyDailyReportScRsp = 7020; + public static final int BuyNpcStuffScRsp = 4343; + public static final int GetMissionDataCsReq = 1268; + public static final int ChessRogueFinishCurRoomNotify = 5467; + public static final int TextJoinQueryCsReq = 3811; + public static final int RotateMapScRsp = 6829; + public static final int LeaveChallengeScRsp = 1793; + public static final int TakeRogueAeonLevelRewardCsReq = 1810; + public static final int MonopolyGuessDrawScNotify = 7067; + public static final int MonopolyGameGachaCsReq = 7078; + public static final int SummonPunkLordMonsterScRsp = 3229; + public static final int FinishItemIdCsReq = 2756; + public static final int MuseumRandomEventSelectCsReq = 4392; + public static final int RefreshTriggerByClientCsReq = 1463; + public static final int EnterTreasureDungeonScRsp = 4448; + public static final int CommonRogueUpdateScNotify = 5631; + public static final int MissionGroupWarnScNotify = 1254; + public static final int GetEnteredSceneScRsp = 1477; + public static final int ArchiveWolfBroGameScRsp = 6543; + public static final int SyncTaskScRsp = 1239; + public static final int RogueWorkbenchSelectFuncScRsp = 5655; + public static final int EvolveBuildLeaveScRsp = 7120; + public static final int PickRogueAvatarScRsp = 1897; + public static final int SetFriendMarkCsReq = 2940; + public static final int EnterChallengeNextPhaseScRsp = 1709; + public static final int RogueWorkbenchSelectFuncCsReq = 5677; + public static final int EvolveBuildShopAbilityUpCsReq = 7105; + public static final int MatchThreeSetBirdPosScRsp = 7423; + public static final int RogueModifierSelectCellScRsp = 5356; + public static final int HeliobusUpgradeLevelScRsp = 5848; + public static final int TakeMultipleExpeditionRewardScRsp = 2525; + public static final int MonopolyGuessChooseScRsp = 7095; + public static final int QuitBattleScNotify = 151; + public static final int StartRaidScRsp = 2206; + public static final int RogueModifierStageStartNotify = 5333; + public static final int EnterChallengeNextPhaseCsReq = 1728; + public static final int MonopolyGetRegionProgressCsReq = 7072; + public static final int GetFriendBattleRecordDetailScRsp = 2931; + public static final int ComposeSelectedRelicCsReq = 528; + public static final int GetFriendAssistListScRsp = 2953; + public static final int GetTreasureDungeonActivityDataScRsp = 4454; + public static final int GetPlayerBoardDataScRsp = 2806; + public static final int GetMonopolyDailyReportCsReq = 7091; + public static final int TakeMailAttachmentScRsp = 829; + public static final int SetDisplayAvatarCsReq = 2856; + public static final int ChessRogueQueryAeonDimensionsScRsp = 5536; + public static final int HeliobusSnsLikeCsReq = 5839; + public static final int MatchBoxingClubOpponentScRsp = 4243; + public static final int ArchiveWolfBroGameCsReq = 6511; + public static final int AceAntiCheaterScRsp = 59; + public static final int SyncRogueCommonDialogueDataScNotify = 5671; + public static final int GetAllLineupDataCsReq = 724; + public static final int GetMonopolyMbtiReportRewardScRsp = 7001; + public static final int GetPunkLordDataCsReq = 3234; + public static final int UnlockTutorialGuideScRsp = 1629; + public static final int EnterSceneByServerScNotify = 1483; + public static final int DeleteFriendScRsp = 2948; public static final int EnterSummonActivityStageScRsp = 7570; - public static final int RogueTournReviveAvatarScRsp = 6071; - public static final int GetTutorialScRsp = 1674; - public static final int TravelBrochureGetDataScRsp = 6474; - public static final int GiveUpBoxingClubChallengeCsReq = 4228; - public static final int FinishCurTurnCsReq = 4389; - public static final int EnterFeverTimeActivityStageScRsp = 7155; - public static final int GetFriendLoginInfoCsReq = 2914; - public static final int GetFriendListInfoScRsp = 2974; - public static final int RogueTournEnterScRsp = 6028; - public static final int GetQuestDataCsReq = 918; - public static final int PlayerReturnInfoQueryScRsp = 4564; - public static final int PlayerReturnStartScNotify = 4518; - public static final int ExchangeRogueBuffWithMiracleScRsp = 5648; - public static final int UpdateMechanismBarScNotify = 1433; - public static final int UpdatePlayerSettingCsReq = 31; - public static final int RogueTournEnablePermanentTalentCsReq = 6057; - public static final int GetGunPlayDataCsReq = 4177; - public static final int SceneReviveAfterRebattleCsReq = 1477; - public static final int LeaveAetherDivideSceneCsReq = 4829; - public static final int MarkReadMailScRsp = 837; - public static final int GetServerPrefsDataCsReq = 6129; - public static final int GetTrainVisitorBehaviorScRsp = 3737; - public static final int SelectInclinationTextScRsp = 2164; - public static final int SetIsDisplayAvatarInfoScRsp = 2841; - public static final int GetRogueInitialScoreCsReq = 1887; - public static final int LeaveChallengeCsReq = 1758; - public static final int StartTimedCocoonStageCsReq = 1415; - public static final int MonopolyMoveScRsp = 7019; - public static final int MultiplayerGetFightGateScRsp = 1037; - public static final int ChessRogueUpdateBoardScNotify = 5515; - public static final int GetQuestDataScRsp = 974; - public static final int BuyNpcStuffCsReq = 4329; - public static final int CancelActivityExpeditionCsReq = 2557; - public static final int GetLevelRewardTakenListScRsp = 11; - public static final int MatchThreeGetDataScRsp = 7429; - public static final int MultiplayerFightGameStateScRsp = 1074; - public static final int HandleRogueCommonPendingActionCsReq = 5700; - public static final int GetTrackPhotoActivityDataCsReq = 7552; - public static final int ChessRogueQuestFinishNotify = 5578; - public static final int MonopolyLikeScNotify = 7068; - public static final int SetCurWaypointCsReq = 429; - public static final int ChessRogueCheatRollScRsp = 5567; - public static final int SetFriendRemarkNameScRsp = 2908; - public static final int GetFriendListInfoCsReq = 2918; - public static final int HeliobusLineupUpdateScNotify = 5877; - public static final int SwordTrainingFinishEndingHintCsReq = 7493; - public static final int TakeChapterRewardCsReq = 441; - public static final int SelectPhoneThemeScRsp = 5128; - public static final int DoGachaInRollShopScRsp = 6905; - public static final int EnterFeverTimeActivityStageCsReq = 7152; - public static final int StartChallengeScRsp = 1737; - public static final int LobbyGetInfoScRsp = 7374; - public static final int BuyGoodsScRsp = 1537; - public static final int BuyRogueShopBuffCsReq = 5664; - public static final int UpdateMovieRacingDataScRsp = 4121; - public static final int OfferingInfoScNotify = 6929; - public static final int FinishTutorialCsReq = 1619; - public static final int WolfBroGameDataChangeScNotify = 6589; - public static final int MatchThreeSetBirdPosCsReq = 7420; - public static final int HeliobusUpgradeLevelCsReq = 5846; - public static final int HeliobusSelectSkillCsReq = 5822; - public static final int FinishFirstTalkByPerformanceNpcScRsp = 2198; - public static final int SceneUpdatePositionVersionNotify = 1457; - public static final int EnterTelevisionActivityStageScRsp = 6963; - public static final int EndDrinkMakerSequenceScRsp = 6984; - public static final int ChessRogueSkipTeachingLevelScRsp = 5489; - public static final int GetMultipleDropInfoCsReq = 4618; - public static final int GetPhoneDataCsReq = 5118; - public static final int SetAvatarPathCsReq = 52; - public static final int LobbyJoinCsReq = 7356; - public static final int PlayerHeartBeatScRsp = 90; - public static final int RaidCollectionDataScRsp = 6957; - public static final int GetDrinkMakerDataScRsp = 6997; - public static final int MonopolyGetRegionProgressScRsp = 7054; - public static final int GetSingleRedDotParamGroupScRsp = 5949; - public static final int ChessRogueGoAheadScRsp = 5529; - public static final int MonopolyReRollRandomScRsp = 7062; - public static final int MarkAvatarScRsp = 347; - public static final int RogueTournHandBookNotify = 6020; - public static final int GetTutorialCsReq = 1618; - public static final int GetArchiveDataScRsp = 2374; - public static final int SyncAddBlacklistScNotify = 2962; - public static final int GetSwordTrainingDataCsReq = 7479; - public static final int ExchangeRogueRewardKeyCsReq = 1833; - public static final int ChessRogueGiveUpCsReq = 5524; - public static final int StartTimedFarmElementScRsp = 1443; - public static final int ReplaceLineupCsReq = 711; - public static final int RogueTournLeaveRogueCocoonSceneCsReq = 6050; - public static final int SetBoxingClubResonanceLineupCsReq = 4246; - public static final int GetFriendBattleRecordDetailCsReq = 2968; - public static final int GetAllRedDotDataCsReq = 5918; - public static final int RogueTournStartCsReq = 6031; - public static final int StartTrialActivityCsReq = 2690; - public static final int MonopolyGetRaffleTicketScRsp = 7034; - public static final int GetPlayerBoardDataCsReq = 2818; - public static final int StarFightDataChangeNotify = 7166; - public static final int TakeAllRewardCsReq = 3041; - public static final int ChessRogueQueryAeonDimensionsCsReq = 5510; - public static final int PunkLordMonsterInfoScNotify = 3283; - public static final int ChessRogueStartScRsp = 5570; - public static final int GetRogueInfoScRsp = 1874; - public static final int RogueModifierSelectCellCsReq = 5337; - public static final int LogisticsGameScRsp = 4737; - public static final int GetAssistListCsReq = 2961; - public static final int EnterAdventureCsReq = 1318; - public static final int GetAetherDivideInfoScRsp = 4857; - public static final int GetCurAssistScRsp = 2913; - public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5608; - public static final int RankUpEquipmentScRsp = 564; - public static final int RogueTournExpNotify = 6030; - public static final int SellItemScRsp = 548; - public static final int ChallengeBossPhaseSettleNotify = 1724; - public static final int FinishChessRogueNousSubStoryScRsp = 5560; + public static final int RogueTournReviveAvatarScRsp = 6042; + public static final int GetTutorialScRsp = 1606; + public static final int TravelBrochureGetDataScRsp = 6406; + public static final int GiveUpBoxingClubChallengeCsReq = 4239; + public static final int FinishCurTurnCsReq = 4399; + public static final int EnterFeverTimeActivityStageScRsp = 7154; + public static final int GetFriendLoginInfoCsReq = 2969; + public static final int GetFriendListInfoScRsp = 2906; + public static final int RogueTournEnterScRsp = 6033; + public static final int GetQuestDataCsReq = 968; + public static final int PlayerReturnInfoQueryScRsp = 4533; + public static final int PlayerReturnStartScNotify = 4568; + public static final int ExchangeRogueBuffWithMiracleScRsp = 5624; + public static final int UpdateMechanismBarScNotify = 1431; + public static final int UpdatePlayerSettingCsReq = 64; + public static final int RogueTournEnablePermanentTalentCsReq = 6022; + public static final int GetGunPlayDataCsReq = 4109; + public static final int SceneReviveAfterRebattleCsReq = 1409; + public static final int LeaveAetherDivideSceneCsReq = 4811; + public static final int MarkReadMailScRsp = 843; + public static final int RogueArcadeLeaveCsReq = 7665; + public static final int GetServerPrefsDataCsReq = 6111; + public static final int GetTrainVisitorBehaviorScRsp = 3743; + public static final int SelectInclinationTextScRsp = 2133; + public static final int SetIsDisplayAvatarInfoScRsp = 2829; + public static final int GetRogueInitialScoreCsReq = 1895; + public static final int LeaveChallengeCsReq = 1756; + public static final int StartTimedCocoonStageCsReq = 1444; + public static final int MonopolyMoveScRsp = 7051; + public static final int MultiplayerGetFightGateScRsp = 1043; + public static final int ChessRogueUpdateBoardScNotify = 5518; + public static final int GetQuestDataScRsp = 906; + public static final int BuyNpcStuffCsReq = 4311; + public static final int CancelActivityExpeditionCsReq = 2554; + public static final int GetLevelRewardTakenListScRsp = 90; + public static final int MatchThreeGetDataScRsp = 7424; + public static final int MultiplayerFightGameStateScRsp = 1006; + public static final int HandleRogueCommonPendingActionCsReq = 5647; + public static final int GetTrackPhotoActivityDataCsReq = 7551; + public static final int ChessRogueQuestFinishNotify = 5460; + public static final int MonopolyLikeScNotify = 7041; + public static final int SetCurWaypointCsReq = 411; + public static final int ChessRogueCheatRollScRsp = 5499; + public static final int SetFriendRemarkNameScRsp = 2992; + public static final int GetFriendListInfoCsReq = 2968; + public static final int HeliobusLineupUpdateScNotify = 5809; + public static final int TakeChapterRewardCsReq = 429; + public static final int SelectPhoneThemeScRsp = 5139; + public static final int DoGachaInRollShopScRsp = 6920; + public static final int EnterFeverTimeActivityStageCsReq = 7151; + public static final int StartChallengeScRsp = 1743; + public static final int LobbyGetInfoScRsp = 7371; + public static final int BuyGoodsScRsp = 1543; + public static final int BuyRogueShopBuffCsReq = 5633; + public static final int UpdateMovieRacingDataScRsp = 4128; + public static final int OfferingInfoScNotify = 6936; + public static final int FinishTutorialCsReq = 1651; + public static final int WolfBroGameDataChangeScNotify = 6599; + public static final int MatchThreeSetBirdPosCsReq = 7408; + public static final int HeliobusUpgradeLevelCsReq = 5865; + public static final int HeliobusSelectSkillCsReq = 5834; + public static final int FinishFirstTalkByPerformanceNpcScRsp = 2148; + public static final int SceneUpdatePositionVersionNotify = 1454; + public static final int EnterTelevisionActivityStageScRsp = 6964; + public static final int EndDrinkMakerSequenceScRsp = 6982; + public static final int ChessRogueSkipTeachingLevelScRsp = 5531; + public static final int GetMultipleDropInfoCsReq = 4668; + public static final int GetPhoneDataCsReq = 5168; + public static final int SetAvatarPathCsReq = 20; + public static final int LobbyJoinCsReq = 7365; + public static final int PlayerHeartBeatScRsp = 3; + public static final int RaidCollectionDataScRsp = 6943; + public static final int GetDrinkMakerDataScRsp = 6983; + public static final int MonopolyGetRegionProgressScRsp = 7005; + public static final int GetSingleRedDotParamGroupScRsp = 5993; + public static final int ChessRogueGoAheadScRsp = 5556; + public static final int MonopolyReRollRandomScRsp = 7098; + public static final int MarkAvatarScRsp = 381; + public static final int RogueTournHandBookNotify = 6056; + public static final int GetTutorialCsReq = 1668; + public static final int GetArchiveDataScRsp = 2306; + public static final int SyncAddBlacklistScNotify = 2998; + public static final int GetSwordTrainingDataCsReq = 7474; + public static final int ExchangeRogueRewardKeyCsReq = 1831; + public static final int ChessRogueGiveUpCsReq = 5585; + public static final int StartTimedFarmElementScRsp = 1487; + public static final int ReplaceLineupCsReq = 790; + public static final int RogueTournLeaveRogueCocoonSceneCsReq = 6064; + public static final int SetBoxingClubResonanceLineupCsReq = 4265; + public static final int GetFriendBattleRecordDetailCsReq = 2941; + public static final int GetAllRedDotDataCsReq = 5968; + public static final int RogueTournStartCsReq = 6083; + public static final int StartTrialActivityCsReq = 2603; + public static final int MonopolyGetRaffleTicketScRsp = 7083; + public static final int GetPlayerBoardDataCsReq = 2868; + public static final int StarFightDataChangeNotify = 7162; + public static final int TakeAllRewardCsReq = 3029; + public static final int ChessRogueQueryAeonDimensionsCsReq = 5413; + public static final int PunkLordMonsterInfoScNotify = 3282; + public static final int ChessRogueStartScRsp = 5600; + public static final int GetRogueInfoScRsp = 1806; + public static final int RogueModifierSelectCellCsReq = 5343; + public static final int LogisticsGameScRsp = 4743; + public static final int GetAssistListCsReq = 2932; + public static final int EnterAdventureCsReq = 1368; + public static final int GetAetherDivideInfoScRsp = 4854; + public static final int GetCurAssistScRsp = 2976; + public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5692; + public static final int RankUpEquipmentScRsp = 533; + public static final int RogueTournExpNotify = 6017; + public static final int SellItemScRsp = 524; + public static final int ChallengeBossPhaseSettleNotify = 1788; + public static final int FinishChessRogueNousSubStoryScRsp = 5577; public static final int StartStarFightLevelScRsp = 7170; - public static final int SelectChessRogueSubStoryScRsp = 5517; - public static final int FinishQuestScRsp = 989; - public static final int MarkRelicFilterPlanCsReq = 533; - public static final int RogueTournTakeExpRewardScRsp = 6081; - public static final int ChangeLineupLeaderScRsp = 783; - public static final int TakePictureCsReq = 4158; - public static final int GetBagScRsp = 574; - public static final int GetPunkLordMonsterDataScRsp = 3274; - public static final int SavePointsInfoNotify = 1409; - public static final int DeleteBlacklistCsReq = 2977; - public static final int SubmitEmotionItemCsReq = 6358; - public static final int StartWolfBroGameScRsp = 6574; - public static final int GetChallengeRaidInfoScRsp = 2228; - public static final int GetSocialEventServerCacheCsReq = 7094; - public static final int GetRogueScoreRewardInfoScRsp = 1885; - public static final int GetLoginChatInfoCsReq = 3983; - public static final int QuitLineupCsReq = 728; - public static final int GetAvatarDataCsReq = 318; - public static final int GetBoxingClubInfoScRsp = 4274; - public static final int StartAetherDivideSceneBattleCsReq = 4858; - public static final int SyncRogueCommonDialogueOptionFinishScNotify = 5676; - public static final int MonopolyEventLoadUpdateScNotify = 7093; - public static final int ChooseBoxingClubResonanceScRsp = 4257; - public static final int GetAetherDivideChallengeInfoCsReq = 4824; - public static final int GetMissionEventDataCsReq = 1283; - public static final int StopRogueAdventureRoomScRsp = 5624; - public static final int RelicAvatarRecommendCsReq = 512; - public static final int GetFriendChallengeDetailCsReq = 2910; - public static final int TakePrestigeRewardScRsp = 4757; - public static final int HeliobusChallengeUpdateScNotify = 5821; - public static final int EvolveBuildShopAbilityResetCsReq = 7117; - public static final int GetCurLineupDataScRsp = 737; - public static final int PrestigeLevelUpCsReq = 4773; - public static final int GetCurChallengeCsReq = 1764; - public static final int TakeOfferingRewardCsReq = 6923; - public static final int GetRaidInfoScRsp = 2257; - public static final int TravelBrochurePageUnlockScNotify = 6429; - public static final int SpaceZooDataScRsp = 6774; - public static final int PromoteAvatarScRsp = 341; - public static final int ChessRogueGiveUpRollScRsp = 5455; - public static final int MonopolyLikeScRsp = 7020; - public static final int SyncAcceptedPamMissionNotify = 4029; - public static final int TakeExpeditionRewardCsReq = 2528; - public static final int TakeMonsterResearchActivityRewardCsReq = 2673; - public static final int GetRogueAeonInfoScRsp = 1869; - public static final int StartPartialChallengeCsReq = 1740; - public static final int QuitTreasureDungeonScRsp = 4421; - public static final int EvolveBuildReRandomStageScRsp = 7103; - public static final int MonopolyGetDailyInitItemScRsp = 7060; - public static final int RogueModifierDelNotify = 5319; - public static final int LevelUpSpecialSkillTreeScRsp = 338; - public static final int GetRollShopInfoCsReq = 6914; - public static final int BatchGetQuestDataCsReq = 983; - public static final int MuseumRandomEventQueryScRsp = 4373; - public static final int SearchPlayerScRsp = 2947; - public static final int TeleportToMissionResetPointScRsp = 1247; - public static final int GetCurSceneInfoCsReq = 1428; - public static final int RogueWorkbenchHandleFuncScRsp = 5651; - public static final int GetAllServerPrefsDataCsReq = 6118; - public static final int SyncRogueVirtualItemInfoScNotify = 1863; - public static final int GetRogueTalentInfoScRsp = 1866; - public static final int QuitWolfBroGameScRsp = 6541; - public static final int GetWolfBroGameDataScRsp = 6564; - public static final int ChessRogueUpdateDiceInfoScNotify = 5447; - public static final int MonopolyRollRandomCsReq = 7083; - public static final int ChangeStoryLineFinishScNotify = 6249; - public static final int LobbyBeginScRsp = 7370; - public static final int GetChallengeGroupStatisticsScRsp = 1762; - public static final int ChessRogueEnterCellCsReq = 5493; - public static final int GetSaveRaidCsReq = 2283; - public static final int RogueGetGambleInfoCsReq = 5630; - public static final int ChallengeSettleNotify = 1728; - public static final int ClockParkQuitScriptScRsp = 7298; - public static final int ReviveRogueAvatarScRsp = 1848; - public static final int RemoveStuffFromAreaCsReq = 4328; - public static final int SetAssistCsReq = 2982; - public static final int ContentPackageGetDataCsReq = 7519; - public static final int EvolveBuildStartStageScRsp = 7120; - public static final int SpaceZooOpCatteryScRsp = 6741; - public static final int SetPlayerInfoCsReq = 23; - public static final int WolfBroGameUseBulletScRsp = 6546; - public static final int FightSessionStopScNotify = 30028; - public static final int ShowNewSupplementVisitorScRsp = 3757; - public static final int ChessRogueConfirmRollCsReq = 5415; - public static final int PickRogueAvatarCsReq = 1822; - public static final int GetRogueInfoCsReq = 1818; - public static final int RestoreWolfBroGameArchiveScRsp = 6549; - public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4283; - public static final int EvolveBuildShopAbilityDownScRsp = 7116; - public static final int SetGroupCustomSaveDataCsReq = 1490; - public static final int GetUpdatedArchiveDataScRsp = 2337; - public static final int HeliobusInfoChangedScNotify = 5857; - public static final int MonopolyReRollRandomCsReq = 7091; - public static final int GetStuffScNotify = 4319; - public static final int TakePromotionRewardScRsp = 373; - public static final int GetFirstTalkNpcScRsp = 2149; - public static final int SwordTrainingRestoreGameCsReq = 7476; - public static final int GameplayCounterRecoverCsReq = 1426; - public static final int StartWolfBroGameCsReq = 6518; - public static final int PromoteEquipmentCsReq = 529; - public static final int EnterSectionScRsp = 1447; - public static final int GetChessRogueStoryInfoCsReq = 5482; - public static final int MonopolyGetDailyInitItemCsReq = 7044; - public static final int RogueGetGambleInfoScRsp = 5652; - public static final int RogueTournBattleFailSettleInfoScNotify = 6027; - public static final int QuitRogueScRsp = 1802; - public static final int UnlockTutorialGuideCsReq = 1628; - public static final int MonopolyContentUpdateScNotify = 7061; - public static final int SwordTrainingRefreshPartnerAbilityScRsp = 7451; - public static final int PlayerLoginFinishCsReq = 76; - public static final int ChessRogueEnterNextLayerCsReq = 5473; - public static final int BatchMarkChatEmojiCsReq = 3946; - public static final int SceneGroupRefreshScNotify = 1405; - public static final int ReBattleAfterBattleLoseCsNotify = 146; - public static final int RogueDoGambleScRsp = 5669; - public static final int TakeCityShopRewardCsReq = 1558; - public static final int LobbyKickOutCsReq = 7359; - public static final int MatchResultScNotify = 7337; - public static final int FinishCurTurnScRsp = 4357; - public static final int GetRogueCollectionScRsp = 5671; - public static final int RogueWorkbenchGetInfoCsReq = 5601; + public static final int SelectChessRogueSubStoryScRsp = 5587; + public static final int FinishQuestScRsp = 999; + public static final int MarkRelicFilterPlanCsReq = 531; + public static final int RogueTournTakeExpRewardScRsp = 6049; + public static final int ChangeLineupLeaderScRsp = 782; + public static final int TakePictureCsReq = 4156; + public static final int GetBagScRsp = 506; + public static final int GetPunkLordMonsterDataScRsp = 3206; + public static final int SavePointsInfoNotify = 1449; + public static final int DeleteBlacklistCsReq = 2909; + public static final int SubmitEmotionItemCsReq = 6356; + public static final int ActivityRaidPlacingGameCsReq = 4730; + public static final int StartWolfBroGameScRsp = 6506; + public static final int GetChallengeRaidInfoScRsp = 2239; + public static final int GetSocialEventServerCacheCsReq = 7022; + public static final int GetRogueScoreRewardInfoScRsp = 1879; + public static final int GetLoginChatInfoCsReq = 3982; + public static final int QuitLineupCsReq = 739; + public static final int GetAvatarDataCsReq = 368; + public static final int GetBoxingClubInfoScRsp = 4206; + public static final int StartAetherDivideSceneBattleCsReq = 4856; + public static final int SyncRogueCommonDialogueOptionFinishScNotify = 5673; + public static final int MonopolyEventLoadUpdateScNotify = 7052; + public static final int ChooseBoxingClubResonanceScRsp = 4254; + public static final int GetAetherDivideChallengeInfoCsReq = 4888; + public static final int GetMissionEventDataCsReq = 1282; + public static final int StopRogueAdventureRoomScRsp = 5688; + public static final int RelicAvatarRecommendCsReq = 2415; + public static final int GetFriendChallengeDetailCsReq = 2959; + public static final int TakePrestigeRewardScRsp = 4754; + public static final int HeliobusChallengeUpdateScNotify = 5828; + public static final int EvolveBuildShopAbilityResetCsReq = 7133; + public static final int GetCurLineupDataScRsp = 743; + public static final int PrestigeLevelUpCsReq = 4717; + public static final int GetCurChallengeCsReq = 1733; + public static final int TakeOfferingRewardCsReq = 6924; + public static final int GetRaidInfoScRsp = 2254; + public static final int TravelBrochurePageUnlockScNotify = 6411; + public static final int SpaceZooDataScRsp = 6706; + public static final int PromoteAvatarScRsp = 329; + public static final int ChessRogueGiveUpRollScRsp = 5489; + public static final int MonopolyLikeScRsp = 7007; + public static final int SyncAcceptedPamMissionNotify = 4011; + public static final int TakeExpeditionRewardCsReq = 2539; + public static final int TakeMonsterResearchActivityRewardCsReq = 2617; + public static final int GetRogueAeonInfoScRsp = 1827; + public static final int StartPartialChallengeCsReq = 1725; + public static final int QuitTreasureDungeonScRsp = 4428; + public static final int EvolveBuildReRandomStageScRsp = 7106; + public static final int MonopolyGetDailyInitItemScRsp = 7055; + public static final int RogueModifierDelNotify = 5351; + public static final int GetRollShopInfoCsReq = 6919; + public static final int BatchGetQuestDataCsReq = 982; + public static final int MuseumRandomEventQueryScRsp = 4317; + public static final int SearchPlayerScRsp = 2981; + public static final int TeleportToMissionResetPointScRsp = 1281; + public static final int GetCurSceneInfoCsReq = 1439; + public static final int RogueWorkbenchHandleFuncScRsp = 5636; + public static final int GetAllServerPrefsDataCsReq = 6168; + public static final int SyncRogueVirtualItemInfoScNotify = 1819; + public static final int GetRogueTalentInfoScRsp = 1838; + public static final int QuitWolfBroGameScRsp = 6529; + public static final int GetWolfBroGameDataScRsp = 6533; + public static final int ChessRogueUpdateDiceInfoScNotify = 5461; + public static final int MonopolyRollRandomCsReq = 7082; + public static final int ChangeStoryLineFinishScNotify = 6293; + public static final int LobbyBeginScRsp = 7358; + public static final int GetChallengeGroupStatisticsScRsp = 1798; + public static final int ChessRogueEnterCellCsReq = 5490; + public static final int GetSaveRaidCsReq = 2282; + public static final int RogueGetGambleInfoCsReq = 5691; + public static final int ChallengeSettleNotify = 1739; + public static final int ClockParkQuitScriptScRsp = 7212; + public static final int ReviveRogueAvatarScRsp = 1824; + public static final int RemoveStuffFromAreaCsReq = 4339; + public static final int SetAssistCsReq = 2984; + public static final int ContentPackageGetDataCsReq = 7507; + public static final int EvolveBuildStartStageScRsp = 7108; + public static final int SpaceZooOpCatteryScRsp = 6729; + public static final int SetPlayerInfoCsReq = 30; + public static final int WolfBroGameUseBulletScRsp = 6565; + public static final int FightSessionStopScNotify = 30039; + public static final int ShowNewSupplementVisitorScRsp = 3754; + public static final int ChessRogueConfirmRollCsReq = 5523; + public static final int PickRogueAvatarCsReq = 1834; + public static final int GetRogueInfoCsReq = 1868; + public static final int RestoreWolfBroGameArchiveScRsp = 6593; + public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4282; + public static final int EvolveBuildShopAbilityDownScRsp = 7103; + public static final int SetGroupCustomSaveDataCsReq = 1403; + public static final int GetUpdatedArchiveDataScRsp = 2343; + public static final int HeliobusInfoChangedScNotify = 5854; + public static final int MonopolyReRollRandomCsReq = 7097; + public static final int GetStuffScNotify = 4351; + public static final int TakePromotionRewardScRsp = 317; + public static final int GetFirstTalkNpcScRsp = 2193; + public static final int SwordTrainingRestoreGameCsReq = 7491; + public static final int GameplayCounterRecoverCsReq = 1462; + public static final int StartWolfBroGameCsReq = 6568; + public static final int PromoteEquipmentCsReq = 511; + public static final int EnterSectionScRsp = 1481; + public static final int RogueArcadeRestartScRsp = 7658; + public static final int GetChessRogueStoryInfoCsReq = 5497; + public static final int MonopolyGetDailyInitItemCsReq = 7077; + public static final int RogueGetGambleInfoScRsp = 5620; + public static final int RogueTournBattleFailSettleInfoScNotify = 6020; + public static final int QuitRogueScRsp = 1878; + public static final int UnlockTutorialGuideCsReq = 1639; + public static final int MonopolyContentUpdateScNotify = 7032; + public static final int PlayerLoginFinishCsReq = 73; + public static final int ChessRogueEnterNextLayerCsReq = 5568; + public static final int BatchMarkChatEmojiCsReq = 3965; + public static final int SceneGroupRefreshScNotify = 1402; + public static final int ReBattleAfterBattleLoseCsNotify = 165; + public static final int RogueDoGambleScRsp = 5627; + public static final int TakeCityShopRewardCsReq = 1556; + public static final int LobbyKickOutCsReq = 7384; + public static final int MatchResultScNotify = 7311; + public static final int FinishCurTurnScRsp = 4354; + public static final int GetRogueCollectionScRsp = 5650; + public static final int RogueWorkbenchGetInfoCsReq = 5642; public static final int GetFeverTimeActivityDataCsReq = 7160; - public static final int MonopolyGiveUpCurContentCsReq = 7077; - public static final int SceneCastSkillCostMpCsReq = 1498; - public static final int TakeOffAvatarSkinScRsp = 377; - public static final int AlleyShipmentEventEffectsScNotify = 4761; - public static final int ClockParkUnlockTalentCsReq = 7258; - public static final int GetChallengeScRsp = 1774; - public static final int MuseumDispatchFinishedScNotify = 4321; - public static final int GetGachaInfoScRsp = 1974; - public static final int TextJoinSaveScRsp = 3874; - public static final int InteractChargerScRsp = 6837; - public static final int ChessRogueEnterCsReq = 5521; - public static final int MultiplayerFightGameStartScNotify = 1028; - public static final int ExchangeRogueBuffWithMiracleCsReq = 5640; - public static final int HeliobusSnsCommentScRsp = 5864; - public static final int SelectPhoneThemeCsReq = 5149; - public static final int SetCurInteractEntityScRsp = 1459; - public static final int LobbySyncInfoScNotify = 7351; - public static final int MakeDrinkScRsp = 6985; - public static final int TakeApRewardCsReq = 3318; - public static final int MonopolyCellUpdateNotify = 7037; - public static final int StartMatchScRsp = 7329; - public static final int GetMissionDataScRsp = 1274; - public static final int StartAetherDivideSceneBattleScRsp = 4849; - public static final int QuitWolfBroGameCsReq = 6528; - public static final int AcceptMultipleExpeditionCsReq = 2522; - public static final int GetMainMissionCustomValueScRsp = 1213; - public static final int TextJoinQueryScRsp = 3837; - public static final int SpringRecoverSingleAvatarScRsp = 1468; - public static final int BatchGetQuestDataScRsp = 922; - public static final int SyncEntityBuffChangeListScNotify = 1446; - public static final int FinishFirstTalkNpcCsReq = 2128; - public static final int ClockParkStartScriptScRsp = 7241; - public static final int HeliobusSnsLikeScRsp = 5841; - public static final int EnterRogueMapRoomCsReq = 1880; - public static final int MatchBoxingClubOpponentCsReq = 4229; - public static final int GetFantasticStoryActivityDataCsReq = 4918; - public static final int SpaceZooDataCsReq = 6718; - public static final int TriggerVoiceScRsp = 4198; - public static final int PrepareRogueAdventureRoomCsReq = 5674; - public static final int AceAntiCheaterCsReq = 100; - public static final int GetRogueShopBuffInfoCsReq = 5649; - public static final int SetForbidOtherApplyFriendScRsp = 2912; - public static final int ExpUpEquipmentScRsp = 557; - public static final int SetDisplayAvatarScRsp = 2849; - public static final int ChessRogueRollDiceCsReq = 5450; - public static final int GetTutorialGuideCsReq = 1629; - public static final int MultipleDropInfoScNotify = 4629; - public static final int TakeMultipleExpeditionRewardCsReq = 2562; - public static final int ChessRogueMoveCellNotify = 5536; - public static final int EvolveBuildGiveupCsReq = 7112; - public static final int DelMailCsReq = 858; - public static final int GetServerPrefsDataScRsp = 6137; - public static final int TakePunkLordPointRewardCsReq = 3246; - public static final int QuitBattleScRsp = 137; - public static final int EnterMapRotationRegionCsReq = 6818; - public static final int TakeTrainVisitorUntakenBehaviorRewardCsReq = 3719; - public static final int SwordTrainingFinishEndingHintScRsp = 7492; - public static final int MuseumTakeCollectRewardScRsp = 4361; - public static final int PlayerLoginCsReq = 18; - public static final int GetFriendLoginInfoScRsp = 2975; - public static final int GetChapterCsReq = 458; - public static final int LobbyQuitCsReq = 7391; - public static final int RogueTournResetPermanentTalentCsReq = 6066; - public static final int GetTrialActivityDataCsReq = 2636; - public static final int GetTrainVisitorBehaviorCsReq = 3729; - public static final int FinishRogueCommonDialogueScRsp = 5678; - public static final int GetSpringRecoverDataCsReq = 1442; - public static final int GetActivityScheduleConfigScRsp = 2649; - public static final int CommonRogueComponentUpdateScNotify = 5625; - public static final int GetHeartDialInfoCsReq = 6318; - public static final int GetRogueHandbookDataScRsp = 5670; - public static final int GetRelicFilterPlanScRsp = 516; - public static final int HandleRogueCommonPendingActionScRsp = 5610; - public static final int ClockParkHandleWaitOperationCsReq = 7289; - public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5571; - public static final int DiscardRelicScRsp = 514; - public static final int FeatureSwitchClosedScNotify = 3; - public static final int TakeQuestRewardScRsp = 937; - public static final int MultiplayerGetFightGateCsReq = 1029; - public static final int TakeKilledPunkLordMonsterScoreCsReq = 3261; - public static final int AetherDivideSpiritInfoScNotify = 4877; - public static final int GetRndOptionScRsp = 3474; - public static final int FightLeaveScNotify = 30029; - public static final int RevcMsgScNotify = 3929; - public static final int WolfBroGamePickupBulletCsReq = 6598; - public static final int GetMissionStatusScRsp = 1273; - public static final int SetAetherDivideLineUpScRsp = 4898; - public static final int GetPunkLordBattleRecordCsReq = 3259; - public static final int SelectRogueCommonDialogueOptionScRsp = 5632; - public static final int ChessRogueQuitScRsp = 5588; - public static final int SwordTrainingTurnActionScRsp = 7487; - public static final int FinishPerformSectionIdCsReq = 2719; - public static final int GetSingleRedDotParamGroupCsReq = 5958; - public static final int GetSummonActivityDataScRsp = 7565; - public static final int PlayerReturnSignScRsp = 4529; - public static final int ActivateFarmElementScRsp = 1412; - public static final int ReturnLastTownCsReq = 1473; - public static final int StartAlleyEventScRsp = 4741; - public static final int PlayerLogoutScRsp = 37; - public static final int GetEnteredSceneCsReq = 1469; - public static final int LobbyJoinScRsp = 7395; - public static final int MonopolyUpgradeAssetCsReq = 7011; - public static final int SetSpringRecoverConfigCsReq = 1416; - public static final int GetAllLineupDataScRsp = 773; - public static final int CancelMarkItemNotify = 506; - public static final int DestroyItemCsReq = 582; - public static final int MultiplayerFightGiveUpScRsp = 1049; - public static final int GetChessRogueNousStoryInfoScRsp = 5466; - public static final int GetDrinkMakerDataCsReq = 6994; - public static final int TakeFightActivityRewardScRsp = 3628; - public static final int SwordTrainingGiveUpGameCsReq = 7467; - public static final int GetRecyleTimeScRsp = 547; - public static final int FinishChessRogueSubStoryCsReq = 5411; - public static final int SwordTrainingStoryConfirmCsReq = 7498; - public static final int DailyFirstEnterMonopolyActivityScRsp = 7098; - public static final int AddEquipmentScNotify = 524; - public static final int GetNpcMessageGroupScRsp = 2774; - public static final int MonopolySelectOptionCsReq = 7064; - public static final int GetKilledPunkLordMonsterDataCsReq = 3221; - public static final int GetVideoVersionKeyCsReq = 1; - public static final int AddBlacklistScRsp = 2991; - public static final int MonopolyCheatDiceScRsp = 7047; - public static final int EndDrinkMakerSequenceCsReq = 6983; - public static final int TakeLoginActivityRewardCsReq = 2629; - public static final int DestroyItemScRsp = 559; - public static final int SyncRogueAeonLevelUpRewardScNotify = 1865; - public static final int EvolveBuildQueryInfoCsReq = 7119; - public static final int TakeRogueEndlessActivityAllBonusRewardScRsp = 6009; - public static final int MuseumRandomEventSelectScRsp = 4311; - public static final int RogueTournEnterRogueCocoonSceneCsReq = 6024; - public static final int ExpUpRelicCsReq = 583; - public static final int GetSceneMapInfoCsReq = 1451; - public static final int ComposeItemScRsp = 598; - public static final int RogueTournGetSettleInfoCsReq = 6044; - public static final int GetMapRotationDataScRsp = 6857; - public static final int GameplayCounterCountDownCsReq = 1499; - public static final int DrinkMakerUpdateTipsNotify = 6990; - public static final int FightHeartBeatCsReq = 30058; - public static final int GetChapterScRsp = 449; - public static final int MuseumFundsChangedScNotify = 4362; - public static final int ReEnterLastElementStageCsReq = 1494; - public static final int UnlockTutorialCsReq = 1658; - public static final int GetLevelRewardScRsp = 77; - public static final int AvatarExpUpScRsp = 337; - public static final int MuseumTargetStartNotify = 4377; - public static final int GetReplayTokenScRsp = 3574; - public static final int GetRogueCommonDialogueDataScRsp = 5667; - public static final int ClockParkGetInfoScRsp = 7274; - public static final int GetChatFriendHistoryScRsp = 3941; - public static final int MonopolyBuyGoodsScRsp = 7008; - public static final int GetMuseumInfoCsReq = 4318; - public static final int SetTurnFoodSwitchCsReq = 580; - public static final int BattleCollegeDataChangeScNotify = 5729; - public static final int SetAssistAvatarCsReq = 2857; - public static final int EnterAdventureScRsp = 1374; - public static final int RogueTournTakeExpRewardCsReq = 6016; - public static final int LogisticsGameCsReq = 4729; - public static final int GetChatEmojiListCsReq = 3919; - public static final int ClockParkGetOngoingScriptInfoScRsp = 7264; - public static final int DressAvatarSkinScRsp = 311; - public static final int GetAssistListScRsp = 2938; - public static final int AetherDivideTakeChallengeRewardScRsp = 4806; - public static final int SetClientRaidTargetCountCsReq = 2246; - public static final int StartStarFightLevelCsReq = 7167; - public static final int GetMovieRacingDataCsReq = 4173; - public static final int MonopolyClickMbtiReportCsReq = 7066; - public static final int GetTrainVisitorRegisterScRsp = 3741; - public static final int ChessRoguePickAvatarCsReq = 5495; - public static final int ChessRogueNousEnableRogueTalentCsReq = 5531; - public static final int GetBattleCollegeDataCsReq = 5718; - public static final int InteractTreasureDungeonGridCsReq = 4440; - public static final int SetSignatureScRsp = 2889; - public static final int EquipAetherDividePassiveSkillScRsp = 4822; - public static final int GetChallengeRaidInfoCsReq = 2249; - public static final int SetForbidOtherApplyFriendCsReq = 2953; - public static final int GetStarFightDataScRsp = 7165; - public static final int RogueTournGetCurRogueCocoonInfoScRsp = 6061; - public static final int InterruptMissionEventScRsp = 1211; - public static final int GetPlatformPlayerInfoCsReq = 2987; - public static final int RefreshTriggerByClientScRsp = 1466; - public static final int RemoveRotaterScRsp = 6840; - public static final int ClientObjUploadScRsp = 93; - public static final int GetArchiveDataCsReq = 2318; - public static final int RogueTournReviveAvatarCsReq = 6083; - public static final int GetPlayerDetailInfoCsReq = 2929; - public static final int GetShopListCsReq = 1518; - public static final int SwordTrainingExamResultConfirmScRsp = 7480; - public static final int EvolveBuildCoinNotify = 7139; - public static final int SaveLogisticsScRsp = 4792; - public static final int EvolveBuildStartLevelScRsp = 7145; - public static final int MuseumTargetMissionFinishNotify = 4324; - public static final int TakePictureScRsp = 4149; - public static final int SetRedPointStatusScNotify = 17; - public static final int FightMatch3TurnStartScNotify = 30137; - public static final int LobbyCreateScRsp = 7379; - public static final int GetLoginActivityScRsp = 2674; - public static final int DressAvatarScRsp = 364; - public static final int UpgradeAreaCsReq = 4346; - public static final int DailyActiveInfoNotify = 3358; - public static final int FightMatch3ChatScNotify = 30189; - public static final int ExchangeGachaCeilingCsReq = 1928; - public static final int ChessRogueSkipTeachingLevelCsReq = 5519; - public static final int RogueTournReviveCostUpdateScNotify = 6011; - public static final int SubmitOrigamiItemScRsp = 4122; - public static final int ContentPackageUnlockCsReq = 7545; - public static final int GetGachaCeilingCsReq = 1958; - public static final int SyncClientResVersionScRsp = 141; - public static final int RogueDoGambleCsReq = 5635; - public static final int PlayBackGroundMusicScRsp = 3137; - public static final int ResetMapRotationRegionCsReq = 6846; - public static final int RogueTournGetMiscRealTimeDataCsReq = 6084; - public static final int EvolveBuildShopAbilityUpScRsp = 7131; - public static final int MuseumInfoChangedScNotify = 4391; - public static final int StartBattleCollegeCsReq = 5737; - public static final int GetCurChallengeScRsp = 1789; - public static final int GetTreasureDungeonActivityDataCsReq = 4489; - public static final int GetMainMissionCustomValueCsReq = 1202; - public static final int FinishCosumeItemMissionScRsp = 1298; - public static final int GetPhoneDataScRsp = 5174; - public static final int FightMatch3StartCountDownScNotify = 30129; - public static final int UpgradeAreaStatCsReq = 4383; - public static final int EnhanceRogueBuffCsReq = 1877; - public static final int GetNpcTakenRewardScRsp = 2174; - public static final int MonopolyGameSettleScNotify = 7059; - public static final int HandleFriendScRsp = 2989; - public static final int SearchPlayerCsReq = 2992; - public static final int SwordTrainingLearnSkillCsReq = 7463; - public static final int EnterChessRogueAeonRoomCsReq = 5452; - public static final int EvolveBuildLeaveCsReq = 7109; - public static final int QuitLineupScRsp = 741; - public static final int EnterFightActivityStageCsReq = 3637; - public static final int MultiplayerMatch3FinishScNotify = 1019; - public static final int SpaceZooBornCsReq = 6729; - public static final int SwordTrainingResumeGameCsReq = 7452; - public static final int GetJukeboxDataScRsp = 3174; - public static final int TakeRogueMiracleHandbookRewardCsReq = 5623; - public static final int RogueTournDeleteArchiveCsReq = 6099; - public static final int EvolveBuildFinishScNotify = 7101; - public static final int AddRelicFilterPlanCsReq = 536; - public static final int SwordTrainingGetSkillInfoCsReq = 7461; - public static final int FinishTalkMissionCsReq = 1229; - public static final int PlayerReturnTakePointRewardScRsp = 4549; - public static final int FinishSectionIdScRsp = 2741; - public static final int ModifyRelicFilterPlanScRsp = 510; - public static final int RogueTournSettleScRsp = 6069; - public static final int JoinLineupScRsp = 749; - public static final int GetCurBattleInfoCsReq = 158; - public static final int EnterSummonActivityStageCsReq = 7567; - public static final int ChooseBoxingClubResonanceCsReq = 4289; - public static final int AcceptExpeditionScRsp = 2537; - public static final int FightActivityDataChangeScNotify = 3629; - public static final int SwordTrainingUpdateRankCsReq = 7458; - public static final int TrialBackGroundMusicScRsp = 3141; - public static final int OpenRogueChestCsReq = 1820; - public static final int QuitRogueCsReq = 1859; - public static final int ComposeSelectedRelicScRsp = 577; - public static final int MonopolyConfirmRandomCsReq = 7040; - public static final int ChessRogueSelectCellCsReq = 5513; - public static final int AcceptMissionEventCsReq = 1262; - public static final int EnableRogueTalentScRsp = 1850; - public static final int GetSocialEventServerCacheScRsp = 7078; - public static final int SpaceZooOpCatteryCsReq = 6728; - public static final int AlleyGuaranteedFundsScRsp = 4713; - public static final int GetRogueBuffEnhanceInfoCsReq = 1811; - public static final int ContentPackageGetDataScRsp = 7529; - public static final int BuyBpLevelCsReq = 3049; - public static final int TravelBrochureApplyPasterListScRsp = 6408; - public static final int SetIsDisplayAvatarInfoCsReq = 2828; - public static final int EvolveBuildShopAbilityDownCsReq = 7124; - public static final int SwapLineupCsReq = 719; - public static final int PlayerReturnForceFinishScNotify = 4589; - public static final int DoGachaCsReq = 1929; - public static final int LobbyBeginCsReq = 7387; - public static final int TravelBrochurePageResetScRsp = 6448; - public static final int GetFriendChallengeLineupCsReq = 2988; - public static final int DeleteSummonUnitScRsp = 1404; - public static final int RogueTournGetPermanentTalentInfoScRsp = 6092; - public static final int GetFightActivityDataCsReq = 3618; - public static final int MonopolyGetRaffleTicketCsReq = 7001; - public static final int MuseumRandomEventQueryCsReq = 4348; - public static final int EnterRogueCsReq = 1858; - public static final int AetherDivideLineupScNotify = 4859; - public static final int AcceptActivityExpeditionCsReq = 2564; - public static final int GetAuthkeyCsReq = 22; - public static final int RogueTournRenameArchiveScRsp = 6056; - public static final int GetRogueInitialScoreScRsp = 1839; - public static final int GetSecretKeyInfoScRsp = 84; - public static final int StartPartialChallengeScRsp = 1748; - public static final int MarkChatEmojiCsReq = 3989; - public static final int ShareCsReq = 4118; - public static final int SwordTrainingStoryBattleCsReq = 7478; - public static final int OpenTreasureDungeonGridCsReq = 4483; - public static final int MissionAcceptScNotify = 1209; - public static final int SwordTrainingDialogueSelectOptionCsReq = 7471; - public static final int GetMultiPathAvatarInfoScRsp = 44; - public static final int SceneEntityTeleportScRsp = 1476; - public static final int UnlockSkilltreeScRsp = 349; - public static final int GetAllRedDotDataScRsp = 5974; - public static final int InteractPropCsReq = 1429; - public static final int LobbyInviteCsReq = 7355; - public static final int ChessRogueGiveUpRollCsReq = 5448; - public static final int ChessRogueGiveUpScRsp = 5481; - public static final int SendMsgScRsp = 3974; - public static final int PromoteAvatarCsReq = 328; - public static final int EnterTrialActivityStageCsReq = 2610; - public static final int SyncRogueStatusScNotify = 1843; - public static final int GetMonopolyInfoScRsp = 7074; - public static final int StartTimedCocoonStageScRsp = 1496; - public static final int CancelMatchScRsp = 7345; - public static final int GetDailyActiveInfoScRsp = 3337; - public static final int TakeAllRewardScRsp = 3019; - public static final int TravelBrochureSetPageDescStatusCsReq = 6491; - public static final int EnterRogueEndlessActivityStageCsReq = 6007; - public static final int ExchangeStaminaCsReq = 98; - public static final int MonopolyDailySettleScNotify = 7036; - public static final int FinishPlotScRsp = 1174; - public static final int PrestigeLevelUpScRsp = 4708; - public static final int ChessRogueReviveAvatarScRsp = 5470; - public static final int UpdateGunPlayDataCsReq = 4192; - public static final int SyncRogueAeonScNotify = 1834; - public static final int SetStuffToAreaScRsp = 4349; - public static final int LobbyModifyPlayerInfoCsReq = 7362; - public static final int SetAvatarPathScRsp = 35; - public static final int GetRogueScoreRewardInfoCsReq = 1899; - public static final int AlleyOrderChangedScNotify = 4740; - public static final int SceneEnterStageCsReq = 1411; - public static final int EvolveBuildTakeExpRewardScRsp = 7144; - public static final int TakeChallengeRewardCsReq = 1783; - public static final int UpdateRedDotDataScRsp = 5937; - public static final int GetAetherDivideChallengeInfoScRsp = 4892; - public static final int TelevisionActivityDataChangeScNotify = 6973; - public static final int GetLoginChatInfoScRsp = 3922; - public static final int FightMatch3OpponentDataScNotify = 30141; - public static final int MakeMissionDrinkScRsp = 6986; - public static final int GetPlayerReplayInfoCsReq = 3529; - public static final int GetRogueAdventureRoomInfoScRsp = 5683; - public static final int ReserveStaminaExchangeCsReq = 71; - public static final int FinishAeonDialogueGroupScRsp = 1860; - public static final int TakeOffEquipmentScRsp = 357; - public static final int CancelActivityExpeditionScRsp = 2546; - public static final int SetRogueExhibitionCsReq = 5699; - public static final int LeaveRaidScRsp = 2237; - public static final int SetCurWaypointScRsp = 437; - public static final int EnterFantasticStoryActivityStageCsReq = 4937; - public static final int GetMissionEventDataScRsp = 1222; - public static final int DailyRefreshNotify = 16; - public static final int UseTreasureDungeonItemCsReq = 4473; - public static final int SelectChessRogueNousSubStoryCsReq = 5566; - public static final int LeaveRogueCsReq = 1828; - public static final int GetRogueEndlessActivityDataCsReq = 6002; - public static final int AetherDivideRefreshEndlessCsReq = 4802; - public static final int SpaceZooTakeScRsp = 6783; - public static final int BuyRogueShopMiracleScRsp = 5619; - public static final int MatchThreeGetDataCsReq = 7419; - public static final int SwordTrainingUnlockSyncScNotify = 7484; - public static final int RogueTournEnterRoomCsReq = 6033; - public static final int GetAvatarDataScRsp = 374; - public static final int AntiAddictScNotify = 40; - public static final int StartAetherDivideChallengeBattleCsReq = 4828; - public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3764; - public static final int FightMatch3SwapScRsp = 30128; - public static final int SelectChatBubbleScRsp = 5137; - public static final int HeliobusActivityDataCsReq = 5818; - public static final int TakeRollShopRewardCsReq = 6903; - public static final int RelicRecommendScRsp = 553; - public static final int TrialActivityDataChangeScNotify = 2700; - public static final int DrinkMakerChallengeCsReq = 6999; - public static final int GetMbtiReportCsReq = 7033; - public static final int AlleyGuaranteedFundsCsReq = 4702; - public static final int UpdateFeatureSwitchScNotify = 12; - public static final int ChessRogueRollDiceScRsp = 5471; - public static final int GetCrossInfoScRsp = 7312; - public static final int ActivateFarmElementCsReq = 1453; - public static final int SetAetherDivideLineUpCsReq = 4846; - public static final int LobbyQuitScRsp = 7360; - public static final int TakeAllApRewardCsReq = 3349; - public static final int RetcodeNotify = 68; - public static final int RestartChallengePhaseCsReq = 1708; - public static final int AetherDivideFinishChallengeScNotify = 4847; - public static final int UseItemScRsp = 541; - public static final int GetFarmStageGachaInfoCsReq = 1329; - public static final int SwordTrainingDialogueSelectOptionScRsp = 7459; - public static final int InteractPropScRsp = 1437; - public static final int DeleteSocialEventServerCacheScRsp = 7076; - public static final int EnableRogueTalentCsReq = 1855; - public static final int UnlockPhoneThemeScNotify = 5141; - public static final int RogueTournGetSettleInfoScRsp = 6013; - public static final int ClockParkStartScriptCsReq = 7228; - public static final int NewAssistHistoryNotify = 2906; - public static final int AlleyShipUsedCountScNotify = 4759; - public static final int RecoverAllLineupCsReq = 1402; - public static final int GetRelicFilterPlanCsReq = 545; - public static final int HeliobusSnsPostScRsp = 5849; - public static final int SetNicknameCsReq = 48; - public static final int GetChessRogueBuffEnhanceInfoScRsp = 5421; - public static final int AlleyPlacingGameCsReq = 4746; - public static final int DailyFirstEnterMonopolyActivityCsReq = 7046; - public static final int FinishChessRogueSubStoryScRsp = 5407; - public static final int SwordTrainingStoryConfirmScRsp = 7494; - public static final int GetFightActivityDataScRsp = 3674; - public static final int QuitBattleCsReq = 129; - public static final int FinishFirstTalkNpcScRsp = 2141; - public static final int EvolveBuildQueryInfoScRsp = 7129; - public static final int BattleLogReportScRsp = 189; - public static final int ChessRogueEnterScRsp = 5590; - public static final int SetMissionEventProgressCsReq = 1221; - public static final int TreasureDungeonDataScNotify = 4418; - public static final int QuestRecordScNotify = 919; - public static final int MonopolyCheatDiceCsReq = 7092; - public static final int UpdateServerPrefsDataCsReq = 6158; - public static final int ClockParkGetInfoCsReq = 7218; - public static final int GetFeverTimeActivityDataScRsp = 7156; - public static final int GetStoryLineInfoCsReq = 6218; - public static final int ChessRogueUpdateReviveInfoScNotify = 5420; - public static final int ReturnLastTownScRsp = 1408; - public static final int SubmitOfferingItemCsReq = 6933; - public static final int FinishTutorialGuideCsReq = 1689; - public static final int SpaceZooExchangeItemScRsp = 6746; - public static final int MonopolyAcceptQuizCsReq = 7006; - public static final int MonopolySocialEventEffectScNotify = 7032; - public static final int SetSpringRecoverConfigScRsp = 1436; - public static final int GetAlleyInfoCsReq = 4718; - public static final int RogueTournClearArchiveNameScNotify = 6023; - public static final int FightTreasureDungeonMonsterScRsp = 4462; - public static final int FinishCosumeItemMissionCsReq = 1246; - public static final int ChessRogueNousDiceSurfaceUnlockNotify = 5426; - public static final int FinishChapterScNotify = 4929; - public static final int GetTelevisionActivityDataCsReq = 6974; - public static final int EnterSceneCsReq = 1425; - public static final int SetClientPausedCsReq = 1423; - public static final int PlayerLogoutCsReq = 29; - public static final int SpaceZooMutateCsReq = 6758; - public static final int ContentPackageSyncDataScNotify = 7506; - public static final int StartFinishMainMissionScNotify = 1238; - public static final int CancelMatchCsReq = 7306; - public static final int FinishAeonDialogueGroupCsReq = 1844; - public static final int HeliobusSnsUpdateScNotify = 5889; - public static final int FightMatch3DataCsReq = 30118; - public static final int MonopolyRollDiceScRsp = 7028; - public static final int WolfBroGameActivateBulletScRsp = 6591; - public static final int TrainVisitorBehaviorFinishScRsp = 3774; - public static final int LockEquipmentCsReq = 558; - public static final int MultiplayerFightGameFinishScNotify = 1041; - public static final int AetherDivideTainerInfoScNotify = 4861; - public static final int TextJoinBatchSaveCsReq = 3858; - public static final int DeactivateFarmElementScRsp = 1475; - public static final int HeliobusSnsReadCsReq = 5829; - public static final int SwordTrainingGameSyncChangeScNotify = 7469; - public static final int LeaveTrialActivityScRsp = 2632; - public static final int SetGameplayBirthdayScRsp = 88; - public static final int GroupStateChangeScNotify = 1435; - public static final int SetSignatureCsReq = 2864; - public static final int EquipAetherDividePassiveSkillCsReq = 4883; - public static final int SetLanguageScRsp = 61; - public static final int TravelBrochureSelectMessageCsReq = 6458; - public static final int UpdateTrackMainMissionIdCsReq = 1206; - public static final int SetGenderScRsp = 80; - public static final int BoxingClubChallengeUpdateScNotify = 4264; - public static final int GetBasicInfoScRsp = 45; - public static final int TrainRefreshTimeNotify = 3758; - public static final int GetFriendDevelopmentInfoScRsp = 2967; - public static final int TakeCityShopRewardScRsp = 1549; - public static final int ChessRogueUpdateUnlockLevelScNotify = 5472; - public static final int SceneEntityMoveScNotify = 1489; - public static final int LeaveMapRotationRegionCsReq = 6819; - public static final int ExchangeHcoinScRsp = 511; - public static final int DressAvatarSkinCsReq = 308; - public static final int EvolveBuildGiveupScRsp = 7121; - public static final int QueryProductInfoCsReq = 14; - public static final int GetReplayTokenCsReq = 3518; - public static final int ChessRogueNousEnableRogueTalentScRsp = 5449; - public static final int EnhanceCommonRogueBuffCsReq = 5611; - public static final int EnterStrongChallengeActivityStageScRsp = 6637; - public static final int PromoteEquipmentScRsp = 537; - public static final int RaidCollectionDataScNotify = 6953; - public static final int RankUpAvatarScRsp = 383; - public static final int GetMovieRacingDataScRsp = 4108; - public static final int SceneEntityMoveScRsp = 1474; - public static final int TriggerVoiceCsReq = 4146; - public static final int GameplayCounterUpdateScNotify = 1493; - public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5548; - public static final int RegionStopScNotify = 62; - public static final int ClockParkFinishScriptScNotify = 7273; - public static final int DailyTaskDataScNotify = 1241; - public static final int GetMonopolyFriendRankingListScRsp = 7100; - public static final int GetFriendApplyListInfoCsReq = 2958; - public static final int GetUnlockTeleportCsReq = 1495; - public static final int SwordTrainingUpdateRankScRsp = 7496; - public static final int LeaveMapRotationRegionScNotify = 6883; - public static final int SetGroupCustomSaveDataScRsp = 1467; - public static final int SwitchLineupIndexCsReq = 722; - public static final int PlayerGetTokenScRsp = 49; - public static final int GetQuestRecordScRsp = 941; - public static final int RogueModifierUpdateNotify = 5341; - public static final int RestoreWolfBroGameArchiveCsReq = 6558; - public static final int UnlockSpecialSkillTreeScNotify = 382; - public static final int MultiplayerFightGiveUpCsReq = 1058; - public static final int UnlockAvatarPathCsReq = 97; - public static final int PlayerReturnTakeRewardScRsp = 4541; - public static final int ComposeItemCsReq = 546; - public static final int SyncRogueRewardInfoScNotify = 1827; - public static final int RebattleByClientCsNotify = 198; - public static final int UnlockHeadIconScNotify = 2819; - public static final int SwordTrainingMarkEndingViewedScRsp = 7486; - public static final int SyncHandleFriendScNotify = 2957; - public static final int GetGachaInfoCsReq = 1918; - public static final int TakeLoginActivityRewardScRsp = 2637; - public static final int PVEBattleResultCsReq = 118; - public static final int MonopolyGiveUpCurContentScRsp = 7024; - public static final int TakeOffRelicCsReq = 362; - public static final int GetTutorialGuideScRsp = 1637; - public static final int SceneCastSkillCostMpScRsp = 1483; - public static final int InteractChargerCsReq = 6829; - public static final int EntityBindPropScRsp = 1480; - public static final int GetExpeditionDataCsReq = 2518; - public static final int MonopolyConfirmRandomScRsp = 7048; - public static final int AlleyTakeEventRewardScRsp = 4756; - public static final int QuitTrackPhotoStageCsReq = 7553; - public static final int TravelBrochureSetCustomValueScRsp = 6422; - public static final int ScenePlaneEventScNotify = 1417; - public static final int CurAssistChangedNotify = 2923; - public static final int PlayerReturnTakePointRewardCsReq = 4558; - public static final int RogueTournEnterLayerCsReq = 6072; - public static final int ChessRogueSelectBpCsReq = 5406; - public static final int DeployRotaterCsReq = 6858; - public static final int LobbyKickOutScRsp = 7400; - public static final int TakeFightActivityRewardCsReq = 3649; - public static final int MultipleDropInfoNotify = 4649; - public static final int WaypointShowNewCsNotify = 428; - public static final int AlleyShopLevelScNotify = 4721; - public static final int RogueTournGetAllArchiveCsReq = 6058; - public static final int GeneralVirtualItemDataNotify = 587; - public static final int SetRogueCollectionCsReq = 5695; - public static final int PlayerGetTokenCsReq = 58; - public static final int SwitchAetherDivideLineUpSlotScRsp = 4848; - public static final int HeliobusEnterBattleCsReq = 5848; - public static final int TakeRogueScoreRewardScRsp = 1808; - public static final int ClockParkHandleWaitOperationScRsp = 7257; - public static final int GetFriendRecommendListInfoScRsp = 2948; - public static final int PlayerReturnSignCsReq = 4574; - public static final int RogueTournLevelInfoUpdateScNotify = 6055; - public static final int SwordTrainingSetSkillTraceScRsp = 7472; - public static final int BoxingClubRewardScNotify = 4219; - public static final int RemoveRotaterCsReq = 6862; - public static final int ChallengeLineupNotify = 1757; - public static final int UpdateTrackMainMissionIdScRsp = 1270; - public static final int GetAssistHistoryScRsp = 2956; - public static final int PlayBackGroundMusicCsReq = 3129; - public static final int SyncRogueExploreWinScNotify = 1809; - public static final int GetMonopolyFriendRankingListCsReq = 7088; - public static final int MonopolyGameBingoFlipCardCsReq = 7009; - public static final int StartBattleCollegeScRsp = 5758; - public static final int ChangeScriptEmotionScRsp = 6337; - public static final int SyncRogueCommonPendingActionScNotify = 5653; - public static final int MarkChatEmojiScRsp = 3957; - public static final int GetSecretKeyInfoCsReq = 78; - public static final int ChessRogueSelectCellScRsp = 5442; - public static final int RogueTournGetPermanentTalentInfoCsReq = 6088; - public static final int BuyBpLevelScRsp = 3028; - public static final int AcceptMissionEventScRsp = 1240; - public static final int GetMonopolyInfoCsReq = 7018; - public static final int GetQuestRecordCsReq = 928; - public static final int EnterRogueScRsp = 1849; - public static final int LastSpringRefreshTimeNotify = 1448; - public static final int LogisticsDetonateStarSkiffScRsp = 4770; - public static final int AvatarPathChangedNotify = 60; - public static final int DrinkMakerDayEndScNotify = 6992; - public static final int TakeOffEquipmentCsReq = 389; - public static final int GetRogueBuffEnhanceInfoScRsp = 1821; - public static final int EnhanceChessRogueBuffCsReq = 5404; - public static final int CancelCacheNotifyScRsp = 4164; - public static final int SendMsgCsReq = 3918; - public static final int SwitchLineupIndexScRsp = 791; - public static final int SetRogueExhibitionScRsp = 5685; - public static final int StoryLineInfoScNotify = 6229; - public static final int TakeRogueScoreRewardCsReq = 1873; - public static final int HeliobusEnterBattleScRsp = 5873; - public static final int SetHeadIconScRsp = 2837; - public static final int AcceptExpeditionCsReq = 2529; - public static final int LogisticsInfoScNotify = 4747; - public static final int DailyFirstMeetPamScRsp = 3437; - public static final int RogueTournEnterRogueCocoonSceneScRsp = 6035; - public static final int RechargeSuccNotify = 573; - public static final int SyncRogueMapRoomScNotify = 1814; - public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5464; - public static final int SwordTrainingStoryBattleScRsp = 7475; - public static final int SceneEntityTeleportCsReq = 1484; - public static final int TravelBrochureUpdatePasterPosScRsp = 6457; - public static final int UnlockTutorialScRsp = 1649; - public static final int UnlockTeleportNotify = 1427; - public static final int SummonActivityBattleEndScNotify = 7566; - public static final int MonopolyTakeRaffleTicketRewardScRsp = 7051; - public static final int HeartDialScriptChangeScNotify = 6319; - public static final int ExchangeHcoinCsReq = 508; - public static final int ChessRogueQueryBpCsReq = 5564; - public static final int SyncRoguePickAvatarInfoScNotify = 1872; - public static final int FightMatch3DataScRsp = 30174; - public static final int TakeRogueMiracleHandbookRewardScRsp = 5687; - public static final int GetSaveLogisticsMapCsReq = 4738; - public static final int GetRogueExhibitionScRsp = 5665; - public static final int PVEBattleResultScRsp = 174; - public static final int UpdateRedDotDataCsReq = 5929; - public static final int SwordTrainingMarkEndingViewedCsReq = 7464; - public static final int FinishPlotCsReq = 1118; - public static final int SubmitOrigamiItemCsReq = 4183; - public static final int RogueWorkbenchGetInfoScRsp = 5634; - public static final int LobbyModifyPlayerInfoScRsp = 7371; - public static final int MonopolyGameBingoFlipCardScRsp = 7056; - public static final int ExpeditionDataChangeScNotify = 2519; - public static final int GetTelevisionActivityDataScRsp = 6977; - public static final int GroupStateChangeScRsp = 1452; - public static final int SyncRogueReviveInfoScNotify = 1882; - public static final int PlayerKickOutScNotify = 19; - public static final int SyncClientResVersionCsReq = 128; - public static final int TrainVisitorRewardSendNotify = 3749; - public static final int RogueTournGetMiscRealTimeDataScRsp = 6042; - public static final int GetMarkItemListCsReq = 502; - public static final int AetherDivideRefreshEndlessScRsp = 4813; - public static final int ServerSimulateBattleFinishScNotify = 157; - public static final int EnterTrialActivityStageScRsp = 2620; - public static final int GetSummonActivityDataCsReq = 7562; - public static final int EntityBindPropCsReq = 1470; - public static final int GetDailyActiveInfoCsReq = 3329; - public static final int UpdateGunPlayDataScRsp = 4147; - public static final int SpaceZooExchangeItemCsReq = 6757; - public static final int RogueTournReEnterRogueCocoonStageCsReq = 6026; - public static final int ChessRogueReRollDiceCsReq = 5424; - public static final int SecurityReportScRsp = 4157; - public static final int ExtraLineupDestroyNotify = 777; - public static final int FightMatch3ForceUpdateNotify = 30157; - public static final int GetPrivateChatHistoryCsReq = 3958; - public static final int PlayerReturnTakeRewardCsReq = 4528; - public static final int RankUpAvatarCsReq = 398; - public static final int DeleteRelicFilterPlanCsReq = 520; - public static final int GameplayCounterCountDownScRsp = 1485; - public static final int GetRogueHandbookDataCsReq = 5606; - public static final int SceneCastSkillScRsp = 1449; - public static final int ChessRogueChangeyAeonDimensionNotify = 5512; - public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5539; - public static final int AlleyTakeEventRewardCsReq = 4709; - public static final int ChessRogueQuitCsReq = 5549; - public static final int QueryProductInfoScRsp = 75; - public static final int GetTrainVisitorRegisterCsReq = 3728; - public static final int UseItemCsReq = 528; - public static final int ShareScRsp = 4174; - public static final int GetStrongChallengeActivityDataCsReq = 6618; - public static final int TakeAllApRewardScRsp = 3328; - public static final int GetTrialActivityDataScRsp = 2688; - public static final int GetChessRogueBuffEnhanceInfoCsReq = 5534; - public static final int GetFriendApplyListInfoScRsp = 2949; - public static final int EvolveBuildTakeExpRewardCsReq = 7148; - public static final int FightMatch3TurnEndScNotify = 30158; - public static final int EvolveBuildStartLevelCsReq = 7106; - public static final int UnlockSkilltreeCsReq = 358; - public static final int NewMailScNotify = 819; - public static final int TakePromotionRewardCsReq = 348; - public static final int ShowNewSupplementVisitorCsReq = 3789; - public static final int TravelBrochureSelectMessageScRsp = 6449; - public static final int GetNpcStatusScRsp = 2737; - public static final int RogueNpcDisappearScRsp = 5646; - public static final int GetMonsterResearchActivityDataScRsp = 2662; - public static final int ClockParkGetOngoingScriptInfoCsReq = 7219; - public static final int RestartChallengePhaseScRsp = 1711; - public static final int MatchThreeLevelEndCsReq = 7406; - public static final int GetPlatformPlayerInfoScRsp = 2939; - public static final int GetStarFightDataCsReq = 7162; - public static final int SpaceZooTakeCsReq = 6798; - public static final int AddAvatarScNotify = 346; - public static final int SyncChessRogueNousValueScNotify = 5437; - public static final int RelicRecommendCsReq = 575; - public static final int GetChatFriendHistoryCsReq = 3928; - public static final int ClockParkUseBuffScRsp = 7248; - public static final int WolfBroGameActivateBulletCsReq = 6522; - public static final int SettleTrackPhotoStageCsReq = 7557; - public static final int PrivateMsgOfflineUsersScNotify = 3937; - public static final int TakeActivityExpeditionRewardCsReq = 2598; - public static final int UnlockBackGroundMusicCsReq = 3158; - public static final int GetPlayerReplayInfoScRsp = 3537; - public static final int ClientObjUploadCsReq = 85; - public static final int SwordTrainingTakeEndingRewardScRsp = 7483; - public static final int GetFirstTalkNpcCsReq = 2158; - public static final int RogueTournDeleteArchiveScRsp = 6063; - public static final int TakeChallengeRewardScRsp = 1722; - public static final int DressRelicAvatarCsReq = 322; - public static final int FightTreasureDungeonMonsterCsReq = 4491; - public static final int GetFantasticStoryActivityDataScRsp = 4974; - public static final int GetRogueEndlessActivityDataScRsp = 6005; - public static final int SwordTrainingGetSkillInfoScRsp = 7465; - public static final int TravelBrochureRemovePasterScRsp = 6464; - public static final int GetBattleCollegeDataScRsp = 5774; - public static final int SyncRogueAdventureRoomInfoScNotify = 5618; - public static final int SwordTrainingStartGameScRsp = 7466; - public static final int LockEquipmentScRsp = 549; - public static final int SetLineupNameScRsp = 740; - public static final int HeliobusStartRaidScRsp = 5811; - public static final int ResetMapRotationRegionScRsp = 6898; - public static final int HeliobusActivityDataScRsp = 5874; - public static final int GetShareDataScRsp = 4137; - public static final int SpringRefreshScRsp = 1440; - public static final int HeliobusSnsCommentCsReq = 5819; - public static final int RogueTournQueryCsReq = 6059; - public static final int TelevisionActivityBattleEndScNotify = 6964; - public static final int SetStuffToAreaCsReq = 4358; - public static final int SubmitOfferingItemScRsp = 6925; - public static final int SetMissionEventProgressScRsp = 1277; - public static final int SubMissionRewardScNotify = 1224; - public static final int TravelBrochureApplyPasterScRsp = 6441; - public static final int MakeMissionDrinkCsReq = 6989; - public static final int StartFinishSubMissionScNotify = 1261; - public static final int TakeTalkRewardCsReq = 2129; - public static final int ChessRogueUpdateMoneyInfoScNotify = 5594; - public static final int TakeBpRewardScRsp = 3058; - public static final int SwordTrainingDailyPhaseConfirmCsReq = 7470; - public static final int MonopolyAcceptQuizScRsp = 7070; - public static final int CityShopInfoScNotify = 1528; - public static final int GetStoryLineInfoScRsp = 6274; - public static final int HeartDialTraceScriptCsReq = 6364; - public static final int SetLanguageCsReq = 47; - public static final int DeactivateFarmElementCsReq = 1414; - public static final int ReportPlayerCsReq = 2911; - public static final int RogueTournLeaveCsReq = 6068; - public static final int EnterSwordTrainingExamScRsp = 7460; - public static final int DressAvatarCsReq = 319; - public static final int TrainVisitorBehaviorFinishCsReq = 3718; - public static final int SpaceZooDeleteCatScRsp = 6764; - public static final int OpenTreasureDungeonGridScRsp = 4422; - public static final int ModifyRelicFilterPlanCsReq = 600; - public static final int GetMultiPathAvatarInfoCsReq = 69; - public static final int SwordTrainingResumeGameScRsp = 7490; - public static final int EnterFightActivityStageScRsp = 3658; - public static final int MonopolyClickCellScRsp = 7069; - public static final int SwordTrainingLearnSkillScRsp = 7481; - public static final int RaidInfoNotify = 2258; - public static final int UpgradeAreaScRsp = 4398; - public static final int ChessRogueQueryScRsp = 5484; - public static final int SwordTrainingSelectEndingCsReq = 7457; - public static final int GmTalkScRsp = 89; - public static final int CancelExpeditionCsReq = 2558; - public static final int SyncApplyFriendScNotify = 2919; - public static final int EnteredSceneChangeScNotify = 1460; - public static final int TravelBrochurePageResetCsReq = 6440; - public static final int MonopolySttUpdateScNotify = 7005; - public static final int EnhanceRogueBuffScRsp = 1824; - public static final int RogueTournConfirmSettleScRsp = 6094; - public static final int SpaceZooCatUpdateNotify = 6789; - public static final int RogueTournGetCurRogueCocoonInfoCsReq = 6090; - public static final int HeliobusSnsPostCsReq = 5858; - public static final int RogueModifierAddNotify = 5329; - public static final int AcceptActivityExpeditionScRsp = 2589; - public static final int PunkLordDataChangeNotify = 3282; - public static final int SetClientRaidTargetCountScRsp = 2298; - public static final int StartPunkLordRaidCsReq = 3229; - public static final int RecoverAllLineupScRsp = 1413; - public static final int DoGachaScRsp = 1937; - public static final int RefreshTriggerByClientScNotify = 1455; - public static final int ChessRogueLeaveScRsp = 5587; - public static final int GetFirstTalkByPerformanceNpcCsReq = 2189; - public static final int TravelBrochureApplyPasterListCsReq = 6473; - public static final int GetFriendDevelopmentInfoCsReq = 2990; - public static final int GetOfferingInfoCsReq = 6934; - public static final int GetFriendChallengeLineupScRsp = 3000; - public static final int LeaveMapRotationRegionScRsp = 6864; - public static final int MarkRelicFilterPlanScRsp = 590; - public static final int SyncRogueHandbookDataUpdateScNotify = 5680; - public static final int StartTrackPhotoStageScRsp = 7558; - public static final int StoryLineTrialAvatarChangeScNotify = 6228; - public static final int GetAssistHistoryCsReq = 2909; - public static final int TakeRogueAeonLevelRewardScRsp = 1871; - public static final int GetSwordTrainingDataScRsp = 7456; - public static final int RogueTournEnterCsReq = 6047; - public static final int AetherDivideSpiritExpUpScRsp = 4821; - public static final int MonopolyTakePhaseRewardCsReq = 7099; - public static final int MissionEventRewardScNotify = 1291; - public static final int RogueTournLeaveRogueCocoonSceneScRsp = 6022; - public static final int UpdateMapRotationDataScNotify = 6891; - public static final int FantasticStoryActivityBattleEndScNotify = 4949; - public static final int SwordTrainingActionTurnSettleScNotify = 7485; - public static final int RelicFilterPlanClearNameScNotify = 567; - public static final int GetRogueTalentInfoCsReq = 1897; - public static final int MonopolyScrachRaffleTicketScRsp = 7071; - public static final int MonopolyGuessBuyInformationScRsp = 7014; - public static final int ChangeScriptEmotionCsReq = 6329; - public static final int GetRogueAdventureRoomInfoCsReq = 5698; - public static final int TakeAssistRewardCsReq = 2970; - public static final int GetLineupAvatarDataCsReq = 757; - public static final int WolfBroGameExplodeMonsterScRsp = 6540; - public static final int RogueTournEnterRoomScRsp = 6029; - public static final int HeliobusUnlockSkillScNotify = 5883; - public static final int TakeTrialActivityRewardCsReq = 2668; - public static final int TakeRogueEndlessActivityPointRewardCsReq = 6008; - public static final int GetGunPlayDataScRsp = 4124; - public static final int SwitchAetherDivideLineUpSlotCsReq = 4840; - public static final int RogueTournLeaveScRsp = 6098; - public static final int GateServerScNotify = 67; - public static final int MuseumTargetRewardNotify = 4392; - public static final int StartRaidCsReq = 2218; - public static final int GetPunkLordMonsterDataCsReq = 3218; - public static final int EnterSceneScRsp = 1401; - public static final int GetBasicInfoCsReq = 42; - public static final int ClockParkBattleEndScNotify = 7291; - public static final int EnterFantasticStoryActivityStageScRsp = 4958; - public static final int SceneEnterStageScRsp = 1421; - public static final int RogueEndlessActivityBattleEndScNotify = 6006; - public static final int RogueTournQueryScRsp = 6018; - public static final int UnlockAvatarPathScRsp = 66; - public static final int GetExpeditionDataScRsp = 2574; - public static final int SelectChessRogueNousSubStoryScRsp = 5535; - public static final int UpdateMovieRacingDataCsReq = 4111; - public static final int MonthCardRewardNotify = 20; - public static final int FinishTutorialGuideScRsp = 1657; - public static final int MonopolyTakeRaffleTicketRewardCsReq = 7017; - public static final int PunkLordMonsterKilledNotify = 3247; - public static final int TakeOffRelicScRsp = 340; - public static final int RogueTournEnablePermanentTalentScRsp = 6012; - public static final int GetMultipleDropInfoScRsp = 4674; - public static final int QuitTrackPhotoStageScRsp = 7554; - public static final int GetUnlockTeleportScRsp = 1454; - public static final int SwordTrainingSetSkillTraceCsReq = 7482; - public static final int ChessRogueReviveAvatarCsReq = 5518; - public static final int LobbyGetInfoCsReq = 7381; - public static final int DressRelicAvatarScRsp = 391; - public static final int LeaveRaidCsReq = 2229; - public static final int HeliobusStartRaidCsReq = 5808; - public static final int MultiplayerFightGameStateCsReq = 1018; - public static final int DailyFirstMeetPamCsReq = 3429; - public static final int TakeMonsterResearchActivityRewardScRsp = 2608; - public static final int SetFriendMarkScRsp = 2945; - public static final int FeverTimeActivityBattleEndScNotify = 7157; - public static final int MonopolyConditionUpdateScNotify = 7097; - public static final int SetFriendRemarkNameCsReq = 2973; - public static final int DeleteSocialEventServerCacheCsReq = 7084; - public static final int EnterTreasureDungeonCsReq = 4446; - public static final int EnterSwordTrainingExamCsReq = 7491; - public static final int TravelBrochureGetPasterScNotify = 6446; - public static final int RotateMapCsReq = 6828; - public static final int MonopolyEventSelectFriendCsReq = 7067; - public static final int HeartDialTraceScriptScRsp = 6389; + public static final int MonopolyGiveUpCurContentCsReq = 7009; + public static final int SceneCastSkillCostMpCsReq = 1448; + public static final int TakeOffAvatarSkinScRsp = 309; + public static final int AlleyShipmentEventEffectsScNotify = 4732; + public static final int ClockParkUnlockTalentCsReq = 7211; + public static final int GetChallengeScRsp = 1706; + public static final int MuseumDispatchFinishedScNotify = 4328; + public static final int GetGachaInfoScRsp = 1906; + public static final int TextJoinSaveScRsp = 3806; + public static final int InteractChargerScRsp = 6843; + public static final int ChessRogueEnterCsReq = 5567; + public static final int MultiplayerFightGameStartScNotify = 1039; + public static final int ExchangeRogueBuffWithMiracleCsReq = 5625; + public static final int HeliobusSnsCommentScRsp = 5833; + public static final int SelectPhoneThemeCsReq = 5193; + public static final int SetCurInteractEntityScRsp = 1423; + public static final int LobbySyncInfoScNotify = 7386; + public static final int MakeDrinkScRsp = 7000; + public static final int TakeApRewardCsReq = 3368; + public static final int MonopolyCellUpdateNotify = 7043; + public static final int StartMatchScRsp = 7324; + public static final int GetMissionDataScRsp = 1206; + public static final int StartAetherDivideSceneBattleScRsp = 4893; + public static final int QuitWolfBroGameCsReq = 6539; + public static final int RaidCollectionEnterNextRaidScRsp = 6944; + public static final int AcceptMultipleExpeditionCsReq = 2534; + public static final int GetMainMissionCustomValueScRsp = 1276; + public static final int TextJoinQueryScRsp = 3843; + public static final int SpringRecoverSingleAvatarScRsp = 1441; + public static final int BatchGetQuestDataScRsp = 934; + public static final int SyncEntityBuffChangeListScNotify = 1465; + public static final int FinishFirstTalkNpcCsReq = 2139; + public static final int ClockParkStartScriptScRsp = 7204; + public static final int HeliobusSnsLikeScRsp = 5829; + public static final int EnterRogueMapRoomCsReq = 1812; + public static final int MatchBoxingClubOpponentCsReq = 4211; + public static final int GetFantasticStoryActivityDataCsReq = 4968; + public static final int SpaceZooDataCsReq = 6768; + public static final int TriggerVoiceScRsp = 4148; + public static final int PrepareRogueAdventureRoomCsReq = 5606; + public static final int AceAntiCheaterCsReq = 47; + public static final int GetRogueShopBuffInfoCsReq = 5693; + public static final int GetChallengeRecommendLineupListCsReq = 2411; + public static final int SetForbidOtherApplyFriendScRsp = 2975; + public static final int ExpUpEquipmentScRsp = 554; + public static final int SetDisplayAvatarScRsp = 2893; + public static final int ChessRogueRollDiceCsReq = 5529; + public static final int GetTutorialGuideCsReq = 1611; + public static final int MultipleDropInfoScNotify = 4611; + public static final int TakeMultipleExpeditionRewardCsReq = 2598; + public static final int ChessRogueMoveCellNotify = 5419; + public static final int EvolveBuildGiveupCsReq = 7123; + public static final int DelMailCsReq = 856; + public static final int GetServerPrefsDataScRsp = 6143; + public static final int TakePunkLordPointRewardCsReq = 3265; + public static final int QuitBattleScRsp = 143; + public static final int EnterMapRotationRegionCsReq = 6868; + public static final int TakeTrainVisitorUntakenBehaviorRewardCsReq = 3751; + public static final int MuseumTakeCollectRewardScRsp = 4332; + public static final int PlayerLoginCsReq = 68; + public static final int GetFriendLoginInfoScRsp = 2967; + public static final int GetChapterCsReq = 456; + public static final int LobbyQuitCsReq = 7362; + public static final int RogueTournResetPermanentTalentCsReq = 6021; + public static final int GetTrialActivityDataCsReq = 2653; + public static final int GetTrainVisitorBehaviorCsReq = 3711; + public static final int FinishRogueCommonDialogueScRsp = 5621; + public static final int GetSpringRecoverDataCsReq = 1440; + public static final int GetActivityScheduleConfigScRsp = 2693; + public static final int CommonRogueComponentUpdateScNotify = 5686; + public static final int GetHeartDialInfoCsReq = 6368; + public static final int GetRogueHandbookDataScRsp = 5646; + public static final int GetRelicFilterPlanScRsp = 600; + public static final int HandleRogueCommonPendingActionScRsp = 5659; + public static final int ClockParkHandleWaitOperationCsReq = 7236; + public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5482; + public static final int DiscardRelicScRsp = 569; + public static final int FeatureSwitchClosedScNotify = 13; + public static final int TakeQuestRewardScRsp = 943; + public static final int MultiplayerGetFightGateCsReq = 1011; + public static final int TakeKilledPunkLordMonsterScoreCsReq = 3232; + public static final int AetherDivideSpiritInfoScNotify = 4809; + public static final int GetRndOptionScRsp = 3406; + public static final int FightLeaveScNotify = 30011; + public static final int RevcMsgScNotify = 3911; + public static final int WolfBroGamePickupBulletCsReq = 6548; + public static final int GetMissionStatusScRsp = 1217; + public static final int SetAetherDivideLineUpScRsp = 4848; + public static final int GetPunkLordBattleRecordCsReq = 3223; + public static final int SelectRogueCommonDialogueOptionScRsp = 5614; + public static final int ChessRogueQuitScRsp = 5444; + public static final int SwordTrainingTurnActionScRsp = 7461; + public static final int FinishPerformSectionIdCsReq = 2751; + public static final int GetSingleRedDotParamGroupCsReq = 5956; + public static final int GetSummonActivityDataScRsp = 7564; + public static final int PlayerReturnSignScRsp = 4511; + public static final int ActivateFarmElementScRsp = 1475; + public static final int ReturnLastTownCsReq = 1417; + public static final int StartAlleyEventScRsp = 4729; + public static final int PlayerLogoutScRsp = 43; + public static final int GetEnteredSceneCsReq = 1427; + public static final int LobbyJoinScRsp = 7367; + public static final int MonopolyUpgradeAssetCsReq = 7090; + public static final int SetSpringRecoverConfigCsReq = 1500; + public static final int GetAllLineupDataScRsp = 717; + public static final int CancelMarkItemNotify = 566; + public static final int DestroyItemCsReq = 584; + public static final int MultiplayerFightGiveUpScRsp = 1093; + public static final int GetChessRogueNousStoryInfoScRsp = 5557; + public static final int GetDrinkMakerDataCsReq = 6999; + public static final int TakeFightActivityRewardScRsp = 3639; + public static final int SwordTrainingGiveUpGameCsReq = 7483; + public static final int GetRecyleTimeScRsp = 581; + public static final int FinishChessRogueSubStoryCsReq = 5418; + public static final int SwordTrainingStoryConfirmCsReq = 7485; + public static final int DailyFirstEnterMonopolyActivityScRsp = 7048; + public static final int AddEquipmentScNotify = 588; + public static final int GetNpcMessageGroupScRsp = 2706; + public static final int MonopolySelectOptionCsReq = 7033; + public static final int GetKilledPunkLordMonsterDataCsReq = 3228; + public static final int GetVideoVersionKeyCsReq = 42; + public static final int AddBlacklistScRsp = 2997; + public static final int MonopolyCheatDiceScRsp = 7081; + public static final int EndDrinkMakerSequenceCsReq = 6984; + public static final int TakeLoginActivityRewardCsReq = 2611; + public static final int DestroyItemScRsp = 523; + public static final int SyncRogueAeonLevelUpRewardScNotify = 1870; + public static final int EvolveBuildQueryInfoCsReq = 7107; + public static final int TakeRogueEndlessActivityAllBonusRewardScRsp = 6005; + public static final int MuseumRandomEventSelectScRsp = 4390; + public static final int RogueTournEnterRogueCocoonSceneCsReq = 6095; + public static final int ExpUpRelicCsReq = 582; + public static final int SummonPetScRsp = 7617; + public static final int GetSceneMapInfoCsReq = 1436; + public static final int ComposeItemScRsp = 548; + public static final int DifficultyAdjustmentUpdateDataCsReq = 4184; + public static final int RogueTournGetSettleInfoCsReq = 6077; + public static final int GetMapRotationDataScRsp = 6854; + public static final int GameplayCounterCountDownCsReq = 1461; + public static final int DrinkMakerUpdateTipsNotify = 6981; + public static final int FightHeartBeatCsReq = 30056; + public static final int GetChapterScRsp = 493; + public static final int MuseumFundsChangedScNotify = 4398; + public static final int ReEnterLastElementStageCsReq = 1422; + public static final int UnlockTutorialCsReq = 1656; + public static final int GetLevelRewardScRsp = 9; + public static final int AvatarExpUpScRsp = 343; + public static final int MuseumTargetStartNotify = 4309; + public static final int GetReplayTokenScRsp = 3506; + public static final int GetRogueCommonDialogueDataScRsp = 5626; + public static final int ClockParkGetInfoScRsp = 7224; + public static final int GetChatFriendHistoryScRsp = 3929; + public static final int MonopolyBuyGoodsScRsp = 7092; + public static final int GetMuseumInfoCsReq = 4368; + public static final int SetTurnFoodSwitchCsReq = 512; + public static final int BattleCollegeDataChangeScNotify = 5711; + public static final int SetAssistAvatarCsReq = 2854; + public static final int EnterAdventureScRsp = 1306; + public static final int RogueTournTakeExpRewardCsReq = 6027; + public static final int LogisticsGameCsReq = 4711; + public static final int GetChatEmojiListCsReq = 3951; + public static final int ClockParkGetOngoingScriptInfoScRsp = 7220; + public static final int DressAvatarSkinScRsp = 390; + public static final int GetAssistListScRsp = 2916; + public static final int AetherDivideTakeChallengeRewardScRsp = 4866; + public static final int SetClientRaidTargetCountCsReq = 2265; + public static final int StartStarFightLevelCsReq = 7169; + public static final int GetMovieRacingDataCsReq = 4117; + public static final int MonopolyClickMbtiReportCsReq = 7038; + public static final int GetTrainVisitorRegisterScRsp = 3729; + public static final int ChessRoguePickAvatarCsReq = 5446; + public static final int ChessRogueNousEnableRogueTalentCsReq = 5571; + public static final int GetBattleCollegeDataCsReq = 5768; + public static final int InteractTreasureDungeonGridCsReq = 4425; + public static final int SetSignatureScRsp = 2899; + public static final int EquipAetherDividePassiveSkillScRsp = 4834; + public static final int GetChallengeRaidInfoCsReq = 2293; + public static final int SetForbidOtherApplyFriendCsReq = 2915; + public static final int GetStarFightDataScRsp = 7164; + public static final int RogueTournGetCurRogueCocoonInfoScRsp = 6041; + public static final int InterruptMissionEventScRsp = 1290; + public static final int GetPlatformPlayerInfoCsReq = 2995; + public static final int RefreshTriggerByClientScRsp = 1438; + public static final int RemoveRotaterScRsp = 6825; + public static final int ClientObjUploadScRsp = 52; + public static final int GetArchiveDataCsReq = 2368; + public static final int RogueTournReviveAvatarCsReq = 6081; + public static final int GetPlayerDetailInfoCsReq = 2911; + public static final int GetShopListCsReq = 1568; + public static final int SwordTrainingExamResultConfirmScRsp = 7478; + public static final int EvolveBuildCoinNotify = 7127; + public static final int SaveLogisticsScRsp = 4708; + public static final int EvolveBuildStartLevelScRsp = 7117; + public static final int MuseumTargetMissionFinishNotify = 4388; + public static final int TakePictureScRsp = 4193; + public static final int SetRedPointStatusScNotify = 96; + public static final int FightMatch3TurnStartScNotify = 30143; + public static final int LobbyCreateScRsp = 7374; + public static final int GetLoginActivityScRsp = 2606; + public static final int DressAvatarScRsp = 333; + public static final int UpgradeAreaCsReq = 4365; + public static final int DailyActiveInfoNotify = 3356; + public static final int FightMatch3ChatScNotify = 30199; + public static final int ExchangeGachaCeilingCsReq = 1939; + public static final int ChessRogueSkipTeachingLevelCsReq = 5477; + public static final int RogueTournReviveCostUpdateScNotify = 6087; + public static final int SubmitOrigamiItemScRsp = 4134; + public static final int ContentPackageUnlockCsReq = 7517; + public static final int GetGachaCeilingCsReq = 1956; + public static final int SyncClientResVersionScRsp = 129; + public static final int GetPetDataCsReq = 7607; + public static final int RogueDoGambleCsReq = 5657; + public static final int PlayBackGroundMusicScRsp = 3143; + public static final int ResetMapRotationRegionCsReq = 6865; + public static final int RogueTournGetMiscRealTimeDataCsReq = 6079; + public static final int EvolveBuildShopAbilityUpScRsp = 7148; + public static final int MuseumInfoChangedScNotify = 4397; + public static final int StartBattleCollegeCsReq = 5743; + public static final int GetCurChallengeScRsp = 1799; + public static final int GetTreasureDungeonActivityDataCsReq = 4499; + public static final int GetMainMissionCustomValueCsReq = 1278; + public static final int FinishCosumeItemMissionScRsp = 1248; + public static final int GetPhoneDataScRsp = 5106; + public static final int FightMatch3StartCountDownScNotify = 30111; + public static final int UpgradeAreaStatCsReq = 4382; + public static final int EnhanceRogueBuffCsReq = 1809; + public static final int GetNpcTakenRewardScRsp = 2106; + public static final int MonopolyGameSettleScNotify = 7023; + public static final int HandleFriendScRsp = 2999; + public static final int SearchPlayerCsReq = 2908; + public static final int SwordTrainingLearnSkillCsReq = 7455; + public static final int RogueArcadeGetInfoScRsp = 7654; + public static final int EnterChessRogueAeonRoomCsReq = 5520; + public static final int EvolveBuildLeaveCsReq = 7134; + public static final int QuitLineupScRsp = 729; + public static final int EnterFightActivityStageCsReq = 3643; + public static final int MultiplayerMatch3FinishScNotify = 1051; + public static final int SpaceZooBornCsReq = 6711; + public static final int SwordTrainingResumeGameCsReq = 7469; + public static final int GetJukeboxDataScRsp = 3106; + public static final int TakeRogueMiracleHandbookRewardCsReq = 5630; + public static final int RogueTournDeleteArchiveCsReq = 6016; + public static final int EvolveBuildFinishScNotify = 7136; + public static final int AddRelicFilterPlanCsReq = 553; + public static final int FinishTalkMissionCsReq = 1211; + public static final int PlayerReturnTakePointRewardScRsp = 4593; + public static final int FinishSectionIdScRsp = 2729; + public static final int ModifyRelicFilterPlanScRsp = 559; + public static final int RogueTournSettleScRsp = 6043; + public static final int JoinLineupScRsp = 793; + public static final int GetCurBattleInfoCsReq = 156; + public static final int EnterSummonActivityStageCsReq = 7569; + public static final int ChooseBoxingClubResonanceCsReq = 4299; + public static final int AcceptExpeditionScRsp = 2543; + public static final int FightActivityDataChangeScNotify = 3611; + public static final int TrialBackGroundMusicScRsp = 3129; + public static final int OpenRogueChestCsReq = 1807; + public static final int QuitRogueCsReq = 1823; + public static final int ComposeSelectedRelicScRsp = 509; + public static final int MonopolyConfirmRandomCsReq = 7025; + public static final int ChessRogueSelectCellCsReq = 5549; + public static final int AcceptMissionEventCsReq = 1298; + public static final int EnableRogueTalentScRsp = 1804; + public static final int GetSocialEventServerCacheScRsp = 7021; + public static final int SpaceZooOpCatteryCsReq = 6739; + public static final int AlleyGuaranteedFundsScRsp = 4776; + public static final int GetRogueBuffEnhanceInfoCsReq = 1890; + public static final int ContentPackageGetDataScRsp = 7524; + public static final int BuyBpLevelCsReq = 3093; + public static final int TravelBrochureApplyPasterListScRsp = 6492; + public static final int SetIsDisplayAvatarInfoCsReq = 2839; + public static final int EvolveBuildShopAbilityDownCsReq = 7121; + public static final int SwapLineupCsReq = 751; + public static final int PlayerReturnForceFinishScNotify = 4599; + public static final int DoGachaCsReq = 1911; + public static final int LobbyBeginCsReq = 7361; + public static final int TravelBrochurePageResetScRsp = 6424; + public static final int GetFriendChallengeLineupCsReq = 2958; + public static final int DeleteSummonUnitScRsp = 1437; + public static final int RogueTournGetPermanentTalentInfoScRsp = 6085; + public static final int GetFightActivityDataCsReq = 3668; + public static final int MonopolyGetRaffleTicketCsReq = 7042; + public static final int MuseumRandomEventQueryCsReq = 4324; + public static final int EnterRogueCsReq = 1856; + public static final int AetherDivideLineupScNotify = 4823; + public static final int AcceptActivityExpeditionCsReq = 2533; + public static final int GetAuthkeyCsReq = 34; + public static final int RogueTournRenameArchiveScRsp = 6088; + public static final int GetRogueInitialScoreScRsp = 1889; + public static final int GetSecretKeyInfoScRsp = 71; + public static final int StartPartialChallengeScRsp = 1724; + public static final int MarkChatEmojiCsReq = 3999; + public static final int ShareCsReq = 4168; + public static final int SwordTrainingStoryBattleCsReq = 7490; + public static final int OpenTreasureDungeonGridCsReq = 4482; + public static final int MissionAcceptScNotify = 1249; + public static final int SwordTrainingDialogueSelectOptionCsReq = 7454; + public static final int GetMultiPathAvatarInfoScRsp = 77; + public static final int SceneEntityTeleportScRsp = 1473; + public static final int UnlockSkilltreeScRsp = 393; + public static final int GetAllRedDotDataScRsp = 5906; + public static final int InteractPropCsReq = 1411; + public static final int LobbyInviteCsReq = 7395; + public static final int ChessRogueGiveUpRollCsReq = 5545; + public static final int ChessRogueGiveUpScRsp = 5456; + public static final int SendMsgScRsp = 3906; + public static final int PromoteAvatarCsReq = 339; + public static final int EnterTrialActivityStageCsReq = 2659; + public static final int SyncRogueStatusScNotify = 1887; + public static final int GetMonopolyInfoScRsp = 7006; + public static final int StartTimedCocoonStageScRsp = 1474; + public static final int CancelMatchScRsp = 7317; + public static final int GetDailyActiveInfoScRsp = 3343; + public static final int TakeAllRewardScRsp = 3051; + public static final int TravelBrochureSetPageDescStatusCsReq = 6497; + public static final int EnterRogueEndlessActivityStageCsReq = 6009; + public static final int ExchangeStaminaCsReq = 48; + public static final int MonopolyDailySettleScNotify = 7053; + public static final int FinishPlotScRsp = 1106; + public static final int PrestigeLevelUpScRsp = 4792; + public static final int ChessRogueReviveAvatarScRsp = 5481; + public static final int UpdateGunPlayDataCsReq = 4108; + public static final int SyncRogueAeonScNotify = 1883; + public static final int FightFestUnlockSkillNotify = 7258; + public static final int SetStuffToAreaScRsp = 4393; + public static final int LobbyModifyPlayerInfoCsReq = 7373; + public static final int SetAvatarPathScRsp = 57; + public static final int GetRogueScoreRewardInfoCsReq = 1861; + public static final int AlleyOrderChangedScNotify = 4725; + public static final int SceneEnterStageCsReq = 1490; + public static final int EvolveBuildTakeExpRewardScRsp = 7125; + public static final int TakeChallengeRewardCsReq = 1782; + public static final int UpdateRedDotDataScRsp = 5943; + public static final int GetAetherDivideChallengeInfoScRsp = 4808; + public static final int TelevisionActivityDataChangeScNotify = 6972; + public static final int GetLoginChatInfoScRsp = 3934; + public static final int FightMatch3OpponentDataScNotify = 30129; + public static final int MakeMissionDrinkScRsp = 6987; + public static final int GetPlayerReplayInfoCsReq = 3511; + public static final int GetRogueAdventureRoomInfoScRsp = 5682; + public static final int ReserveStaminaExchangeCsReq = 50; + public static final int FinishAeonDialogueGroupScRsp = 1855; + public static final int TakeOffEquipmentScRsp = 354; + public static final int CancelActivityExpeditionScRsp = 2565; + public static final int SetRogueExhibitionCsReq = 5661; + public static final int LeaveRaidScRsp = 2243; + public static final int SetCurWaypointScRsp = 443; + public static final int EnterFantasticStoryActivityStageCsReq = 4943; + public static final int GetMissionEventDataScRsp = 1234; + public static final int DailyRefreshNotify = 100; + public static final int UseTreasureDungeonItemCsReq = 4417; + public static final int SelectChessRogueNousSubStoryCsReq = 5427; + public static final int LeaveRogueCsReq = 1839; + public static final int GetRogueEndlessActivityDataCsReq = 6001; + public static final int AetherDivideRefreshEndlessCsReq = 4878; + public static final int SpaceZooTakeScRsp = 6782; + public static final int CurPetChangedScNotify = 7623; + public static final int BuyRogueShopMiracleScRsp = 5651; + public static final int MatchThreeGetDataCsReq = 7407; + public static final int SwordTrainingUnlockSyncScNotify = 7481; + public static final int RogueTournEnterRoomCsReq = 6089; + public static final int GetAvatarDataScRsp = 306; + public static final int AntiAddictScNotify = 25; + public static final int StartAetherDivideChallengeBattleCsReq = 4839; + public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3733; + public static final int FightMatch3SwapScRsp = 30139; + public static final int SelectChatBubbleScRsp = 5143; + public static final int HeliobusActivityDataCsReq = 5868; + public static final int TakeRollShopRewardCsReq = 6904; + public static final int RelicRecommendScRsp = 2424; + public static final int TrialActivityDataChangeScNotify = 2647; + public static final int DrinkMakerChallengeCsReq = 6993; + public static final int GetMbtiReportCsReq = 7031; + public static final int AlleyGuaranteedFundsCsReq = 4778; + public static final int UpdateFeatureSwitchScNotify = 75; + public static final int ChessRogueRollDiceScRsp = 5539; + public static final int GetFightFestDataCsReq = 7257; + public static final int GetCrossInfoScRsp = 7323; + public static final int ActivateFarmElementCsReq = 1415; + public static final int SetAetherDivideLineUpCsReq = 4865; + public static final int LobbyQuitScRsp = 7389; + public static final int TakeAllApRewardCsReq = 3393; + public static final int RetcodeNotify = 41; + public static final int RestartChallengePhaseCsReq = 1792; + public static final int SetMultipleAvatarPathsScRsp = 4; + public static final int AetherDivideFinishChallengeScNotify = 4881; + public static final int UseItemScRsp = 529; + public static final int GetFarmStageGachaInfoCsReq = 1311; + public static final int SwordTrainingDialogueSelectOptionScRsp = 7484; + public static final int InteractPropScRsp = 1443; + public static final int DeleteSocialEventServerCacheScRsp = 7073; + public static final int EnableRogueTalentCsReq = 1880; + public static final int UnlockPhoneThemeScNotify = 5129; + public static final int RogueTournGetSettleInfoScRsp = 6036; + public static final int ClockParkStartScriptCsReq = 7223; + public static final int NewAssistHistoryNotify = 2966; + public static final int AlleyShipUsedCountScNotify = 4723; + public static final int RecoverAllLineupCsReq = 1478; + public static final int GetRelicFilterPlanCsReq = 585; + public static final int HeliobusSnsPostScRsp = 5893; + public static final int SetNicknameCsReq = 24; + public static final int GetChessRogueBuffEnhanceInfoScRsp = 5476; + public static final int AlleyPlacingGameCsReq = 4765; + public static final int DailyFirstEnterMonopolyActivityCsReq = 7065; + public static final int FinishChessRogueSubStoryScRsp = 5491; + public static final int SwordTrainingStoryConfirmScRsp = 7475; + public static final int GetFightActivityDataScRsp = 3606; + public static final int QuitBattleCsReq = 111; + public static final int FinishFirstTalkNpcScRsp = 2129; + public static final int EvolveBuildQueryInfoScRsp = 7124; + public static final int BattleLogReportScRsp = 199; + public static final int ChessRogueEnterScRsp = 5421; + public static final int SetMissionEventProgressCsReq = 1228; + public static final int TreasureDungeonDataScNotify = 4468; + public static final int QuestRecordScNotify = 951; + public static final int MonopolyCheatDiceCsReq = 7008; + public static final int UpdateServerPrefsDataCsReq = 6156; + public static final int ClockParkGetInfoCsReq = 7207; + public static final int GetFeverTimeActivityDataScRsp = 7152; + public static final int GetStoryLineInfoCsReq = 6268; + public static final int ChessRogueUpdateReviveInfoScNotify = 5434; + public static final int ReturnLastTownScRsp = 1492; + public static final int SubmitOfferingItemCsReq = 6932; + public static final int FinishTutorialGuideCsReq = 1699; + public static final int SpaceZooExchangeItemScRsp = 6765; + public static final int MonopolyAcceptQuizCsReq = 7066; + public static final int MonopolySocialEventEffectScNotify = 7014; + public static final int SetSpringRecoverConfigScRsp = 1453; + public static final int GetAlleyInfoCsReq = 4768; + public static final int RogueTournClearArchiveNameScNotify = 6057; + public static final int FightTreasureDungeonMonsterScRsp = 4498; + public static final int FinishCosumeItemMissionCsReq = 1265; + public static final int ChessRogueNousDiceSurfaceUnlockNotify = 5453; + public static final int FinishChapterScNotify = 4911; + public static final int GetTelevisionActivityDataCsReq = 6979; + public static final int EnterSceneCsReq = 1486; + public static final int SetClientPausedCsReq = 1430; + public static final int PlayerLogoutCsReq = 11; + public static final int SpaceZooMutateCsReq = 6756; + public static final int ContentPackageSyncDataScNotify = 7515; + public static final int StartFinishMainMissionScNotify = 1216; + public static final int CancelMatchCsReq = 7315; + public static final int FinishAeonDialogueGroupCsReq = 1877; + public static final int HeliobusSnsUpdateScNotify = 5899; + public static final int FightMatch3DataCsReq = 30168; + public static final int MonopolyRollDiceScRsp = 7039; + public static final int WolfBroGameActivateBulletScRsp = 6597; + public static final int DifficultyAdjustmentGetDataCsReq = 4132; + public static final int TrainVisitorBehaviorFinishScRsp = 3706; + public static final int LockEquipmentCsReq = 556; + public static final int MultiplayerFightGameFinishScNotify = 1029; + public static final int AetherDivideTainerInfoScNotify = 4832; + public static final int TextJoinBatchSaveCsReq = 3856; + public static final int DeactivateFarmElementScRsp = 1467; + public static final int HeliobusSnsReadCsReq = 5811; + public static final int SwordTrainingGameSyncChangeScNotify = 7457; + public static final int LeaveTrialActivityScRsp = 2614; + public static final int SetGameplayBirthdayScRsp = 58; + public static final int GroupStateChangeScNotify = 1457; + public static final int SetSignatureCsReq = 2833; + public static final int EquipAetherDividePassiveSkillCsReq = 4882; + public static final int SetLanguageScRsp = 32; + public static final int TravelBrochureSelectMessageCsReq = 6456; + public static final int UpdateTrackMainMissionIdCsReq = 1266; + public static final int SetGenderScRsp = 12; + public static final int BoxingClubChallengeUpdateScNotify = 4233; + public static final int GetBasicInfoScRsp = 85; + public static final int TrainRefreshTimeNotify = 3756; + public static final int GetFriendDevelopmentInfoScRsp = 2926; + public static final int TakeCityShopRewardScRsp = 1593; + public static final int ChessRogueUpdateUnlockLevelScNotify = 5430; + public static final int SceneEntityMoveScNotify = 1499; + public static final int LeaveMapRotationRegionCsReq = 6851; + public static final int ExchangeHcoinScRsp = 590; + public static final int DressAvatarSkinCsReq = 392; + public static final int EvolveBuildGiveupScRsp = 7104; + public static final int QueryProductInfoCsReq = 69; + public static final int GetReplayTokenCsReq = 3568; + public static final int ChessRogueNousEnableRogueTalentScRsp = 5576; + public static final int EnhanceCommonRogueBuffCsReq = 5690; + public static final int EnterStrongChallengeActivityStageScRsp = 6643; + public static final int PromoteEquipmentScRsp = 543; + public static final int RaidCollectionDataScNotify = 6952; + public static final int RankUpAvatarScRsp = 382; + public static final int GetMovieRacingDataScRsp = 4192; + public static final int SceneEntityMoveScRsp = 1406; + public static final int TriggerVoiceCsReq = 4165; + public static final int GameplayCounterUpdateScNotify = 1452; + public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5463; + public static final int RegionStopScNotify = 98; + public static final int ClockParkFinishScriptScNotify = 7225; + public static final int DailyTaskDataScNotify = 1229; + public static final int GetMonopolyFriendRankingListScRsp = 7047; + public static final int GetFriendApplyListInfoCsReq = 2956; + public static final int GetUnlockTeleportCsReq = 1472; + public static final int LeaveMapRotationRegionScNotify = 6882; + public static final int SetGroupCustomSaveDataScRsp = 1426; + public static final int SwitchLineupIndexCsReq = 734; + public static final int PlayerGetTokenScRsp = 93; + public static final int GetQuestRecordScRsp = 929; + public static final int RogueModifierUpdateNotify = 5329; + public static final int RestoreWolfBroGameArchiveCsReq = 6556; + public static final int MultiplayerFightGiveUpCsReq = 1056; + public static final int UnlockAvatarPathCsReq = 63; + public static final int PlayerReturnTakeRewardScRsp = 4529; + public static final int ComposeItemCsReq = 565; + public static final int SyncRogueRewardInfoScNotify = 1818; + public static final int RebattleByClientCsNotify = 148; + public static final int UnlockHeadIconScNotify = 2851; + public static final int SwordTrainingMarkEndingViewedScRsp = 7468; + public static final int SyncHandleFriendScNotify = 2954; + public static final int GetGachaInfoCsReq = 1968; + public static final int TakeLoginActivityRewardScRsp = 2643; + public static final int PVEBattleResultCsReq = 168; + public static final int MonopolyGiveUpCurContentScRsp = 7088; + public static final int TakeOffRelicCsReq = 398; + public static final int GetTutorialGuideScRsp = 1643; + public static final int SceneCastSkillCostMpScRsp = 1482; + public static final int InteractChargerCsReq = 6811; + public static final int EntityBindPropScRsp = 1412; + public static final int GetExpeditionDataCsReq = 2568; + public static final int MonopolyConfirmRandomScRsp = 7024; + public static final int AlleyTakeEventRewardScRsp = 4745; + public static final int QuitTrackPhotoStageCsReq = 7557; + public static final int TravelBrochureSetCustomValueScRsp = 6434; + public static final int ScenePlaneEventScNotify = 1496; + public static final int CurAssistChangedNotify = 2930; + public static final int PlayerReturnTakePointRewardCsReq = 4556; + public static final int RogueTournEnterLayerCsReq = 6092; + public static final int ChessRogueSelectBpCsReq = 5486; + public static final int DeployRotaterCsReq = 6856; + public static final int LobbyKickOutScRsp = 7370; + public static final int TakeFightActivityRewardCsReq = 3693; + public static final int MultipleDropInfoNotify = 4693; + public static final int WaypointShowNewCsNotify = 439; + public static final int AlleyShopLevelScNotify = 4728; + public static final int RogueTournGetAllArchiveCsReq = 6068; + public static final int GeneralVirtualItemDataNotify = 595; + public static final int SetRogueCollectionCsReq = 5672; + public static final int PlayerGetTokenCsReq = 56; + public static final int SwitchAetherDivideLineUpSlotScRsp = 4824; + public static final int HeliobusEnterBattleCsReq = 5824; + public static final int TakeRogueScoreRewardScRsp = 1892; + public static final int ClockParkHandleWaitOperationScRsp = 7245; + public static final int GetFriendRecommendListInfoScRsp = 2924; + public static final int PlayerReturnSignCsReq = 4506; + public static final int RogueTournLevelInfoUpdateScNotify = 6038; + public static final int SwordTrainingSetSkillTraceScRsp = 7494; + public static final int BoxingClubRewardScNotify = 4251; + public static final int StartFightFestScRsp = 7267; + public static final int RemoveRotaterCsReq = 6898; + public static final int ChallengeLineupNotify = 1754; + public static final int UpdateTrackMainMissionIdScRsp = 1246; + public static final int GetAssistHistoryScRsp = 2945; + public static final int PlayBackGroundMusicCsReq = 3111; + public static final int SyncRogueExploreWinScNotify = 1849; + public static final int GetMonopolyFriendRankingListCsReq = 7058; + public static final int MonopolyGameBingoFlipCardCsReq = 7049; + public static final int StartBattleCollegeScRsp = 5756; + public static final int ChangeScriptEmotionScRsp = 6343; + public static final int SyncRogueCommonPendingActionScNotify = 5615; + public static final int MarkChatEmojiScRsp = 3954; + public static final int GetSecretKeyInfoCsReq = 21; + public static final int ChessRogueSelectCellScRsp = 5532; + public static final int RogueTournGetPermanentTalentInfoCsReq = 6026; + public static final int BuyBpLevelScRsp = 3039; + public static final int AcceptMissionEventScRsp = 1225; + public static final int GetMonopolyInfoCsReq = 7068; + public static final int GetQuestRecordCsReq = 939; + public static final int EnterRogueScRsp = 1893; + public static final int LastSpringRefreshTimeNotify = 1424; + public static final int LogisticsDetonateStarSkiffScRsp = 4746; + public static final int AvatarPathChangedNotify = 55; + public static final int DrinkMakerDayEndScNotify = 6988; + public static final int TakeOffEquipmentCsReq = 399; + public static final int GetRogueBuffEnhanceInfoScRsp = 1828; + public static final int EnhanceChessRogueBuffCsReq = 5458; + public static final int CancelCacheNotifyScRsp = 4133; + public static final int SendMsgCsReq = 3968; + public static final int SwitchLineupIndexScRsp = 797; + public static final int SetRogueExhibitionScRsp = 5679; + public static final int StoryLineInfoScNotify = 6211; + public static final int TakeRogueScoreRewardCsReq = 1817; + public static final int HeliobusEnterBattleScRsp = 5817; + public static final int SetHeadIconScRsp = 2843; + public static final int AcceptExpeditionCsReq = 2511; + public static final int LogisticsInfoScNotify = 4781; + public static final int DailyFirstMeetPamScRsp = 3443; + public static final int RogueTournEnterRogueCocoonSceneScRsp = 6025; + public static final int RechargeSuccNotify = 517; + public static final int SyncRogueMapRoomScNotify = 1869; + public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5426; + public static final int SwordTrainingStoryBattleScRsp = 7452; + public static final int SceneEntityTeleportCsReq = 1471; + public static final int TravelBrochureUpdatePasterPosScRsp = 6454; + public static final int UnlockTutorialScRsp = 1693; + public static final int UnlockTeleportNotify = 1418; + public static final int SummonActivityBattleEndScNotify = 7562; + public static final int MonopolyTakeRaffleTicketRewardScRsp = 7036; + public static final int HeartDialScriptChangeScNotify = 6351; + public static final int ExchangeHcoinCsReq = 592; + public static final int ChessRogueQueryBpCsReq = 5401; + public static final int SyncRoguePickAvatarInfoScNotify = 1835; + public static final int FightMatch3DataScRsp = 30106; + public static final int TakeRogueMiracleHandbookRewardScRsp = 5695; + public static final int GetSaveLogisticsMapCsReq = 4716; + public static final int GetRogueExhibitionScRsp = 5670; + public static final int PVEBattleResultScRsp = 106; + public static final int UpdateRedDotDataCsReq = 5911; + public static final int SwordTrainingMarkEndingViewedCsReq = 7459; + public static final int FinishPlotCsReq = 1168; + public static final int SubmitOrigamiItemCsReq = 4182; + public static final int RogueWorkbenchGetInfoScRsp = 5683; + public static final int FightFestUpdateChallengeRecordNotify = 7273; + public static final int LobbyModifyPlayerInfoScRsp = 7354; + public static final int RaidCollectionEnterNextRaidCsReq = 6960; + public static final int MonopolyGameBingoFlipCardScRsp = 7045; + public static final int ExpeditionDataChangeScNotify = 2551; + public static final int GetTelevisionActivityDataScRsp = 6963; + public static final int GroupStateChangeScRsp = 1420; + public static final int SyncRogueReviveInfoScNotify = 1884; + public static final int PlayerKickOutScNotify = 51; + public static final int SyncClientResVersionCsReq = 139; + public static final int TrainVisitorRewardSendNotify = 3793; + public static final int RogueTournGetMiscRealTimeDataScRsp = 6013; + public static final int GetMarkItemListCsReq = 578; + public static final int AetherDivideRefreshEndlessScRsp = 4876; + public static final int ServerSimulateBattleFinishScNotify = 154; + public static final int EnterTrialActivityStageScRsp = 2607; + public static final int GetSummonActivityDataCsReq = 7561; + public static final int EntityBindPropCsReq = 1446; + public static final int GetDailyActiveInfoCsReq = 3311; + public static final int UpdateGunPlayDataScRsp = 4181; + public static final int SpaceZooExchangeItemCsReq = 6754; + public static final int RogueTournReEnterRogueCocoonStageCsReq = 6063; + public static final int StartFightFestCsReq = 7265; + public static final int ChessRogueReRollDiceCsReq = 5474; + public static final int SecurityReportScRsp = 4154; + public static final int ExtraLineupDestroyNotify = 709; + public static final int FightMatch3ForceUpdateNotify = 30154; + public static final int GetPrivateChatHistoryCsReq = 3956; + public static final int PlayerReturnTakeRewardCsReq = 4539; + public static final int RankUpAvatarCsReq = 348; + public static final int DifficultyAdjustmentUpdateDataScRsp = 4123; + public static final int DeleteRelicFilterPlanCsReq = 507; + public static final int GameplayCounterCountDownScRsp = 1479; + public static final int GetRogueHandbookDataCsReq = 5666; + public static final int SceneCastSkillScRsp = 1493; + public static final int ChessRogueChangeyAeonDimensionNotify = 5425; + public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5592; + public static final int AlleyTakeEventRewardCsReq = 4749; + public static final int ChessRogueQuitCsReq = 5506; + public static final int QueryProductInfoScRsp = 67; + public static final int GetTrainVisitorRegisterCsReq = 3739; + public static final int UseItemCsReq = 539; + public static final int ShareScRsp = 4106; + public static final int GetStrongChallengeActivityDataCsReq = 6668; + public static final int TakeAllApRewardScRsp = 3339; + public static final int GetTrialActivityDataScRsp = 2658; + public static final int GetChessRogueBuffEnhanceInfoCsReq = 5555; + public static final int GetFriendApplyListInfoScRsp = 2993; + public static final int EvolveBuildTakeExpRewardCsReq = 7135; + public static final int FightMatch3TurnEndScNotify = 30156; + public static final int EvolveBuildStartLevelCsReq = 7115; + public static final int UnlockSkilltreeCsReq = 356; + public static final int NewMailScNotify = 851; + public static final int TakePromotionRewardCsReq = 324; + public static final int ShowNewSupplementVisitorCsReq = 3799; + public static final int TravelBrochureSelectMessageScRsp = 6493; + public static final int GetNpcStatusScRsp = 2743; + public static final int RogueNpcDisappearScRsp = 5665; + public static final int GetMonsterResearchActivityDataScRsp = 2698; + public static final int ClockParkGetOngoingScriptInfoCsReq = 7234; + public static final int SetMultipleAvatarPathsCsReq = 80; + public static final int RestartChallengePhaseScRsp = 1790; + public static final int MatchThreeLevelEndCsReq = 7415; + public static final int GetPlatformPlayerInfoScRsp = 2989; + public static final int GetStarFightDataCsReq = 7161; + public static final int SpaceZooTakeCsReq = 6748; + public static final int AddAvatarScNotify = 365; + public static final int SyncChessRogueNousValueScNotify = 5451; + public static final int RelicRecommendCsReq = 2407; + public static final int GetChatFriendHistoryCsReq = 3939; + public static final int ClockParkUseBuffScRsp = 7235; + public static final int WolfBroGameActivateBulletCsReq = 6534; + public static final int SettleTrackPhotoStageCsReq = 7559; + public static final int PrivateMsgOfflineUsersScNotify = 3943; + public static final int TakeActivityExpeditionRewardCsReq = 2548; + public static final int UnlockBackGroundMusicCsReq = 3156; + public static final int GetPlayerReplayInfoScRsp = 3543; + public static final int ClientObjUploadCsReq = 79; + public static final int GetFirstTalkNpcCsReq = 2156; + public static final int RogueTournDeleteArchiveScRsp = 6035; + public static final int TakeChallengeRewardScRsp = 1734; + public static final int DressRelicAvatarCsReq = 334; + public static final int RogueArcadeStartCsReq = 7657; + public static final int FightFestScoreUpdateNotify = 7261; + public static final int FightTreasureDungeonMonsterCsReq = 4497; + public static final int GetFantasticStoryActivityDataScRsp = 4906; + public static final int GetRogueEndlessActivityDataScRsp = 6004; + public static final int TravelBrochureRemovePasterScRsp = 6433; + public static final int GetBattleCollegeDataScRsp = 5706; + public static final int SyncRogueAdventureRoomInfoScNotify = 5668; + public static final int SwordTrainingStartGameScRsp = 7453; + public static final int LockEquipmentScRsp = 593; + public static final int SetLineupNameScRsp = 725; + public static final int HeliobusStartRaidScRsp = 5890; + public static final int ResetMapRotationRegionScRsp = 6848; + public static final int HeliobusActivityDataScRsp = 5806; + public static final int GetShareDataScRsp = 4143; + public static final int SpringRefreshScRsp = 1425; + public static final int HeliobusSnsCommentCsReq = 5851; + public static final int RogueTournQueryCsReq = 6034; + public static final int TelevisionActivityBattleEndScNotify = 6962; + public static final int SetStuffToAreaCsReq = 4356; + public static final int SubmitOfferingItemScRsp = 6940; + public static final int SetMissionEventProgressScRsp = 1209; + public static final int SubMissionRewardScNotify = 1288; + public static final int TravelBrochureApplyPasterScRsp = 6429; + public static final int MakeMissionDrinkCsReq = 6996; + public static final int StartFinishSubMissionScNotify = 1232; + public static final int GetPetDataScRsp = 7624; + public static final int TakeTalkRewardCsReq = 2111; + public static final int ChessRogueUpdateMoneyInfoScNotify = 5442; + public static final int TakeBpRewardScRsp = 3056; + public static final int SwordTrainingDailyPhaseConfirmCsReq = 7458; + public static final int MonopolyAcceptQuizScRsp = 7046; + public static final int CityShopInfoScNotify = 1539; + public static final int GetStoryLineInfoScRsp = 6206; + public static final int HeartDialTraceScriptCsReq = 6333; + public static final int SetLanguageCsReq = 81; + public static final int DeactivateFarmElementCsReq = 1469; + public static final int GetChallengeRecommendLineupListScRsp = 2408; + public static final int ReportPlayerCsReq = 2990; + public static final int RogueTournLeaveCsReq = 6059; + public static final int EnterSwordTrainingExamScRsp = 7489; + public static final int DressAvatarCsReq = 351; + public static final int TrainVisitorBehaviorFinishCsReq = 3768; + public static final int SpaceZooDeleteCatScRsp = 6733; + public static final int OpenTreasureDungeonGridScRsp = 4434; + public static final int ModifyRelicFilterPlanCsReq = 547; + public static final int GetMultiPathAvatarInfoCsReq = 27; + public static final int SwordTrainingResumeGameScRsp = 7497; + public static final int EnterFightActivityStageScRsp = 3656; + public static final int MonopolyClickCellScRsp = 7027; + public static final int SwordTrainingLearnSkillScRsp = 7498; + public static final int RaidInfoNotify = 2256; + public static final int UpgradeAreaScRsp = 4348; + public static final int ChessRogueQueryScRsp = 5507; + public static final int SwordTrainingSelectEndingCsReq = 7463; + public static final int GmTalkScRsp = 99; + public static final int CancelExpeditionCsReq = 2556; + public static final int SyncApplyFriendScNotify = 2951; + public static final int EnteredSceneChangeScNotify = 1455; + public static final int TravelBrochurePageResetCsReq = 6425; + public static final int MonopolySttUpdateScNotify = 7002; + public static final int EnhanceRogueBuffScRsp = 1888; + public static final int RogueTournConfirmSettleScRsp = 6024; + public static final int SpaceZooCatUpdateNotify = 6799; + public static final int RogueTournGetCurRogueCocoonInfoCsReq = 6051; + public static final int RogueArcadeGetInfoCsReq = 7673; + public static final int HeliobusSnsPostCsReq = 5856; + public static final int RogueModifierAddNotify = 5311; + public static final int AcceptActivityExpeditionScRsp = 2599; + public static final int PunkLordDataChangeNotify = 3284; + public static final int SetClientRaidTargetCountScRsp = 2248; + public static final int StartPunkLordRaidCsReq = 3211; + public static final int RecoverAllLineupScRsp = 1476; + public static final int DoGachaScRsp = 1943; + public static final int RefreshTriggerByClientScNotify = 1480; + public static final int ChessRogueLeaveScRsp = 5447; + public static final int GetFirstTalkByPerformanceNpcCsReq = 2199; + public static final int TravelBrochureApplyPasterListCsReq = 6417; + public static final int GetFriendDevelopmentInfoCsReq = 2903; + public static final int GetOfferingInfoCsReq = 6939; + public static final int GetFriendChallengeLineupScRsp = 2947; + public static final int LeaveMapRotationRegionScRsp = 6833; + public static final int MarkRelicFilterPlanScRsp = 503; + public static final int SyncRogueHandbookDataUpdateScNotify = 5612; + public static final int StartTrackPhotoStageScRsp = 7556; + public static final int StoryLineTrialAvatarChangeScNotify = 6239; + public static final int GetAssistHistoryCsReq = 2949; + public static final int TakeRogueAeonLevelRewardScRsp = 1850; + public static final int GetSwordTrainingDataScRsp = 7465; + public static final int RogueTournEnterCsReq = 6099; + public static final int AetherDivideSpiritExpUpScRsp = 4828; + public static final int MonopolyTakePhaseRewardCsReq = 7061; + public static final int MissionEventRewardScNotify = 1297; + public static final int RogueTournLeaveRogueCocoonSceneScRsp = 6086; + public static final int UpdateMapRotationDataScNotify = 6897; + public static final int FantasticStoryActivityBattleEndScNotify = 4993; + public static final int SwordTrainingActionTurnSettleScNotify = 7479; + public static final int RelicFilterPlanClearNameScNotify = 526; + public static final int GetRogueTalentInfoCsReq = 1863; + public static final int MonopolyScrachRaffleTicketScRsp = 7050; + public static final int MonopolyGuessBuyInformationScRsp = 7069; + public static final int ChangeScriptEmotionCsReq = 6311; + public static final int GetRogueAdventureRoomInfoCsReq = 5648; + public static final int TakeAssistRewardCsReq = 2946; + public static final int GetLineupAvatarDataCsReq = 754; + public static final int WolfBroGameExplodeMonsterScRsp = 6525; + public static final int RogueTournEnterRoomScRsp = 6019; + public static final int HeliobusUnlockSkillScNotify = 5882; + public static final int TakeTrialActivityRewardCsReq = 2641; + public static final int TakeRogueEndlessActivityPointRewardCsReq = 6006; + public static final int GetGunPlayDataScRsp = 4188; + public static final int SwitchAetherDivideLineUpSlotCsReq = 4825; + public static final int RogueTournLeaveScRsp = 6078; + public static final int GateServerScNotify = 26; + public static final int MuseumTargetRewardNotify = 4308; + public static final int StartRaidCsReq = 2268; + public static final int GetPunkLordMonsterDataCsReq = 3268; + public static final int EnterSceneScRsp = 1442; + public static final int GetBasicInfoCsReq = 40; + public static final int ClockParkBattleEndScNotify = 7248; + public static final int EnterFantasticStoryActivityStageScRsp = 4956; + public static final int SceneEnterStageScRsp = 1428; + public static final int RogueEndlessActivityBattleEndScNotify = 6002; + public static final int RogueTournQueryScRsp = 6040; + public static final int UnlockAvatarPathScRsp = 38; + public static final int GetExpeditionDataScRsp = 2506; + public static final int SelectChessRogueNousSubStoryScRsp = 5521; + public static final int UpdateMovieRacingDataCsReq = 4190; + public static final int MonthCardRewardNotify = 7; + public static final int FinishTutorialGuideScRsp = 1654; + public static final int MonopolyTakeRaffleTicketRewardCsReq = 7096; + public static final int PunkLordMonsterKilledNotify = 3281; + public static final int TakeOffRelicScRsp = 325; + public static final int RogueTournEnablePermanentTalentScRsp = 6053; + public static final int GetMultipleDropInfoScRsp = 4606; + public static final int QuitTrackPhotoStageScRsp = 7553; + public static final int GetUnlockTeleportScRsp = 1405; + public static final int SwordTrainingSetSkillTraceCsReq = 7460; + public static final int ChessRogueReviveAvatarCsReq = 5569; + public static final int LobbyGetInfoCsReq = 7398; + public static final int DressRelicAvatarScRsp = 397; + public static final int LeaveRaidCsReq = 2211; + public static final int HeliobusStartRaidCsReq = 5892; + public static final int MultiplayerFightGameStateCsReq = 1068; + public static final int DailyFirstMeetPamCsReq = 3411; + public static final int TakeMonsterResearchActivityRewardScRsp = 2692; + public static final int SetFriendMarkScRsp = 2985; + public static final int FeverTimeActivityBattleEndScNotify = 7159; + public static final int MonopolyConditionUpdateScNotify = 7063; + public static final int SetFriendRemarkNameCsReq = 2917; + public static final int DeleteSocialEventServerCacheCsReq = 7071; + public static final int EnterTreasureDungeonCsReq = 4465; + public static final int EnterSwordTrainingExamCsReq = 7462; + public static final int TravelBrochureGetPasterScNotify = 6465; + public static final int RotateMapCsReq = 6839; + public static final int MonopolyEventSelectFriendCsReq = 7026; + public static final int HeartDialTraceScriptScRsp = 6399; public static final int SettleTrackPhotoStageScRsp = 7560; - public static final int ChessRogueUpdateAeonModifierValueScNotify = 5475; - public static final int ContentPackageTransferScNotify = 7520; - public static final int MonopolyBuyGoodsCsReq = 7073; - public static final int GetChatEmojiListScRsp = 3964; - public static final int SetAssistAvatarScRsp = 2846; - public static final int MonopolyClickMbtiReportScRsp = 7055; - public static final int FightMatch3ChatScRsp = 30164; - public static final int FinishEmotionDialoguePerformanceCsReq = 6328; - public static final int SelectChatBubbleCsReq = 5129; - public static final int MissionRewardScNotify = 1258; - public static final int MatchThreeSyncDataScNotify = 7437; - public static final int SyncRogueSeasonFinishScNotify = 1856; - public static final int UnlockedAreaMapScNotify = 1479; - public static final int CancelCacheNotifyCsReq = 4119; - public static final int GetMuseumInfoScRsp = 4374; - public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5546; - public static final int GetSaveLogisticsMapScRsp = 4782; - public static final int SharePunkLordMonsterScRsp = 3249; - public static final int RogueTournWeekChallengeUpdateScNotify = 6078; - public static final int GetFriendRecommendListInfoCsReq = 2940; - public static final int UpdatePsnSettingsInfoCsReq = 5; - public static final int GetSceneMapInfoScRsp = 1481; - public static final int UpdatePlayerSettingScRsp = 65; - public static final int GetMailCsReq = 818; - public static final int SaveLogisticsCsReq = 4724; - public static final int SpaceZooBornScRsp = 6737; - public static final int HandleFriendCsReq = 2964; - public static final int RogueTournStartScRsp = 6093; - public static final int GetPlayerDetailInfoScRsp = 2937; - public static final int InterruptMissionEventCsReq = 1208; - public static final int TakeQuestOptionalRewardScRsp = 946; - public static final int LeaveTrialActivityCsReq = 2603; - public static final int StaminaInfoScNotify = 54; - public static final int RogueTournEnterLayerScRsp = 6038; - public static final int ClearAetherDividePassiveSkillCsReq = 4891; - public static final int FinishTalkMissionScRsp = 1237; - public static final int RogueTournGetAllArchiveScRsp = 6034; - public static final int SetClientPausedScRsp = 1487; - public static final int AetherDivideTakeChallengeRewardCsReq = 4856; - public static final int FinishSectionIdCsReq = 2728; - public static final int TravelBrochureGetDataCsReq = 6418; - public static final int VirtualLineupDestroyNotify = 708; - public static final int TakeRollShopRewardScRsp = 6904; - public static final int MonopolyRollDiceCsReq = 7049; - public static final int MarkItemScRsp = 556; - public static final int FinishTutorialScRsp = 1664; - public static final int StartChallengeCsReq = 1729; - public static final int GetMarkItemListScRsp = 513; - public static final int SetGameplayBirthdayCsReq = 36; - public static final int SyncRogueAreaUnlockScNotify = 1817; - public static final int GetPunkLordDataScRsp = 3291; - public static final int ContentPackageUnlockScRsp = 7537; - public static final int SummonPunkLordMonsterCsReq = 3228; - public static final int StartAetherDivideStageBattleScRsp = 4808; - public static final int GetMonopolyMbtiReportRewardCsReq = 7026; - public static final int RogueTournSettleCsReq = 6039; - public static final int GetNpcTakenRewardCsReq = 2118; - public static final int ExchangeGachaCeilingScRsp = 1941; - public static final int GetGachaCeilingScRsp = 1949; - public static final int TrialBackGroundMusicCsReq = 3128; - public static final int GetRecyleTimeCsReq = 592; - public static final int ChessRogueSelectBpScRsp = 5526; - public static final int OpenRogueChestScRsp = 1868; - public static final int GetPlayerReturnMultiDropInfoCsReq = 4637; - public static final int GetAlleyInfoScRsp = 4774; - public static final int TextJoinBatchSaveScRsp = 3849; - public static final int ClearAetherDividePassiveSkillScRsp = 4862; - public static final int GetStrongChallengeActivityDataScRsp = 6674; - public static final int GetJukeboxDataCsReq = 3118; - public static final int SyncTaskCsReq = 1249; - public static final int SyncChessRogueNousMainStoryScNotify = 5419; - public static final int UpdateRogueAdventureRoomScoreCsReq = 5612; - public static final int FinishItemIdScRsp = 2749; - public static final int RogueTournGetArchiveRepositoryScRsp = 6052; - public static final int AddRelicFilterPlanScRsp = 588; - public static final int UpdatePsnSettingsInfoScRsp = 26; - public static final int SpaceZooMutateScRsp = 6749; - public static final int EnterChessRogueAeonRoomScRsp = 5435; - public static final int PlayerLoginScRsp = 74; - public static final int MonopolyGameGachaScRsp = 7013; - public static final int ChessRogueLayerAccountInfoNotify = 5565; - public static final int GetStageLineupCsReq = 718; - public static final int AlleyFundsScNotify = 4711; - public static final int EnterStrongChallengeActivityStageCsReq = 6629; - public static final int EnhanceCommonRogueBuffScRsp = 5621; - public static final int TakeRogueEventHandbookRewardScRsp = 5614; - public static final int ChessRogueUpdateActionPointScNotify = 5425; - public static final int UpgradeAreaStatScRsp = 4322; - public static final int AlleyEventChangeNotify = 4719; - public static final int TakeQuestOptionalRewardCsReq = 957; - public static final int GetWaypointScRsp = 474; - public static final int GetMailScRsp = 874; - public static final int StartBoxingClubBattleCsReq = 4258; - public static final int UpdateServerPrefsDataScRsp = 6149; - public static final int TakeChallengeRaidRewardCsReq = 2241; - public static final int SceneEntityMoveCsReq = 1418; - public static final int TakePunkLordPointRewardScRsp = 3298; - public static final int ClockParkUseBuffCsReq = 7240; - public static final int GetMonsterResearchActivityDataCsReq = 2691; - public static final int SetGenderCsReq = 70; - public static final int FightMatch3ChatCsReq = 30119; - public static final int EnterMapRotationRegionScRsp = 6874; - public static final int SwordTrainingTurnActionCsReq = 7495; - public static final int GetMissionStatusCsReq = 1248; - public static final int RogueNpcDisappearCsReq = 5657; - public static final int GetNpcStatusCsReq = 2729; - public static final int SyncServerSceneChangeNotify = 1471; - public static final int SelectChessRogueSubStoryCsReq = 5427; - public static final int UnlockChatBubbleScNotify = 5158; - public static final int HealPoolInfoNotify = 1410; - public static final int ReEnterLastElementStageScRsp = 1478; - public static final int MatchThreeLevelEndScRsp = 7445; - public static final int GetAetherDivideInfoCsReq = 4889; - public static final int AvatarExpUpCsReq = 329; - public static final int CancelExpeditionScRsp = 2549; - public static final int LockRelicScRsp = 562; - public static final int GetPrivateChatHistoryScRsp = 3949; - public static final int MonopolyEventSelectFriendScRsp = 7003; - public static final int StartPunkLordRaidScRsp = 3237; - public static final int SceneCastSkillCsReq = 1458; - public static final int ChessRogueStartCsReq = 5511; - public static final int EnterRogueMapRoomScRsp = 1823; - public static final int SyncRogueCommonActionResultScNotify = 5675; - public static final int DiscardRelicCsReq = 539; - public static final int AcceptedPamMissionExpireCsReq = 4018; - public static final int StartMatchCsReq = 7319; - public static final int GetNpcMessageGroupCsReq = 2718; - public static final int HeliobusSnsReadScRsp = 5837; - public static final int SpringRecoverSingleAvatarCsReq = 1420; - public static final int RogueTournResetPermanentTalentScRsp = 6087; - public static final int QuitTreasureDungeonCsReq = 4411; - public static final int GetBagCsReq = 518; - public static final int FinishChessRogueNousSubStoryCsReq = 5579; - public static final int RaidCollectionDataCsReq = 6954; - public static final int ChessRogueQueryCsReq = 5458; - public static final int TeleportToMissionResetPointCsReq = 1292; - public static final int ChessRogueNousEditDiceScRsp = 5463; - public static final int FightHeartBeatScRsp = 30049; - public static final int SceneCastSkillMpUpdateScNotify = 1422; - public static final int SwordTrainingGiveUpGameScRsp = 7499; - public static final int GetRollShopInfoScRsp = 6917; - public static final int AetherDivideSkillItemScNotify = 4838; - public static final int RaidKickByServerScNotify = 2248; - public static final int GetFriendAssistListCsReq = 2916; - public static final int TravelBrochureSetCustomValueCsReq = 6483; - public static final int DelMailScRsp = 849; - public static final int MonopolyUpgradeAssetScRsp = 7021; - public static final int GetRogueCollectionCsReq = 5681; - public static final int FinishFirstTalkByPerformanceNpcCsReq = 2146; - public static final int StartCocoonStageCsReq = 1456; - public static final int DeleteFriendCsReq = 2946; - public static final int GetRogueExhibitionCsReq = 5631; - public static final int ChessRogueEnterCellScRsp = 5516; - public static final int MakeDrinkCsReq = 6993; - public static final int TravelBrochureApplyPasterCsReq = 6428; - public static final int MonopolyGuessChooseCsReq = 7023; - public static final int AcceptMultipleExpeditionScRsp = 2591; - public static final int MonopolySelectOptionScRsp = 7089; - public static final int PlayerReturnInfoQueryCsReq = 4519; - public static final int GetLevelRewardCsReq = 21; - public static final int SwordTrainingDailyPhaseConfirmScRsp = 7462; - public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5500; - public static final int TakeApRewardScRsp = 3374; - public static final int GetRogueCommonDialogueDataCsReq = 5690; - public static final int ChessRogueQueryBpScRsp = 5479; - public static final int RogueWorkbenchHandleFuncCsReq = 5617; - public static final int GetShareDataCsReq = 4129; - public static final int SelectRogueCommonDialogueOptionCsReq = 5603; - public static final int TakeMailAttachmentCsReq = 828; - public static final int EnterTelevisionActivityStageCsReq = 6965; - public static final int AetherDivideRefreshEndlessScNotify = 4809; - public static final int MonopolyActionResultScNotify = 7029; - public static final int HeliobusSelectSkillScRsp = 5891; - public static final int MonopolyGuessBuyInformationCsReq = 7039; - public static final int EnterSectionCsReq = 1492; - public static final int DeleteBlacklistScRsp = 2924; - public static final int TakeKilledPunkLordMonsterScoreScRsp = 3238; - public static final int SwordTrainingSelectEndingScRsp = 7477; - public static final int LevelUpSpecialSkillTreeCsReq = 361; - public static final int ComposeLimitNumCompleteNotify = 561; - public static final int SetNicknameScRsp = 73; - public static final int GameplayCounterRecoverScRsp = 1486; - public static final int GetSpringRecoverDataScRsp = 1445; - public static final int TakeExpeditionRewardScRsp = 2541; - public static final int GetVideoVersionKeyScRsp = 34; - public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6004; - public static final int SyncTurnFoodNotify = 570; - public static final int RefreshAlleyOrderCsReq = 4791; - public static final int SetRogueCollectionScRsp = 5654; - public static final int FightEnterCsReq = 30018; - public static final int SpaceZooDeleteCatCsReq = 6719; - public static final int GetFarmStageGachaInfoScRsp = 1337; - public static final int DeployRotaterScRsp = 6849; - public static final int GetKilledPunkLordMonsterDataScRsp = 3277; - public static final int ChallengeRaidNotify = 2264; - public static final int AddBlacklistCsReq = 2922; - public static final int GetRogueAeonInfoCsReq = 1835; - public static final int GetLineupAvatarDataScRsp = 746; - public static final int PunkLordRaidTimeOutScNotify = 3240; - public static final int TakeAssistRewardScRsp = 2980; - public static final int GetChessRogueNousStoryInfoCsReq = 5480; - public static final int DrinkMakerChallengeScRsp = 6981; - public static final int MarkReadMailCsReq = 829; - public static final int GetRogueShopMiracleInfoScRsp = 5658; - public static final int SelectInclinationTextCsReq = 2119; - public static final int GetOfferingInfoScRsp = 6937; - public static final int PunkLordBattleResultScNotify = 3211; - public static final int SetAssistScRsp = 2959; - public static final int PlayerReturnPointChangeScNotify = 4537; - public static final int FightMatch3SwapCsReq = 30149; - public static final int UpdateEnergyScNotify = 6822; - public static final int SetPlayerInfoScRsp = 87; - public static final int StartTrackPhotoStageCsReq = 7556; - public static final int EnterAetherDivideSceneScRsp = 4874; - public static final int CommonRogueQueryCsReq = 5620; - public static final int ChessRogueLeaveCsReq = 5507; - public static final int SpringRecoverScRsp = 1500; - public static final int ChessRogueConfirmRollScRsp = 5428; - public static final int ReplaceLineupScRsp = 721; - public static final int SubmitMonsterResearchActivityMaterialScRsp = 2648; - public static final int BatchMarkChatEmojiScRsp = 3998; - public static final int LogisticsDetonateStarSkiffCsReq = 4706; - public static final int GetSaveRaidScRsp = 2222; - public static final int RogueTournConfirmSettleCsReq = 6091; - public static final int EvolveBuildStartStageCsReq = 7137; - public static final int SyncChessRogueNousSubStoryScNotify = 5402; - public static final int ClockParkQuitScriptCsReq = 7246; - public static final int PlayerLoginFinishScRsp = 25; - public static final int MonopolyGameRaiseRatioScRsp = 7082; - public static final int SyncChessRogueMainStoryFinishScNotify = 5438; - public static final int ExpUpEquipmentCsReq = 589; - public static final int MonopolyRollRandomScRsp = 7022; - public static final int TravelBrochureUpdatePasterPosCsReq = 6489; - public static final int ChessRogueCheatRollCsReq = 5444; - public static final int SwordTrainingGameSettleScNotify = 7473; - public static final int SyncRogueGetItemScNotify = 1851; - public static final int MonopolyClickCellCsReq = 7035; - public static final int ChessRogueGoAheadCsReq = 5504; - public static final int GetChessRogueStoryInfoScRsp = 5575; - public static final int GmTalkCsReq = 64; - public static final int MonopolyLikeCsReq = 7010; - public static final int PlayerSyncScNotify = 618; - public static final int SetBoxingClubResonanceLineupScRsp = 4298; - public static final int LobbyInviteScNotify = 7363; - public static final int SetHeadIconCsReq = 2829; - public static final int GetTrackPhotoActivityDataScRsp = 7555; - public static final int EnhanceChessRogueBuffScRsp = 5505; - public static final int StartTrialActivityScRsp = 2667; - public static final int ReportPlayerScRsp = 2921; - public static final int MonopolyQuizDurationChangeScNotify = 7053; - public static final int TakeTalkRewardScRsp = 2137; - public static final int GetAllServerPrefsDataScRsp = 6174; - public static final int GetMbtiReportScRsp = 7090; - public static final int ApplyFriendScRsp = 2941; - public static final int DeleteRelicFilterPlanScRsp = 568; - public static final int SceneReviveAfterRebattleScRsp = 1424; - public static final int StartRogueCsReq = 1829; - public static final int GetAllSaveRaidCsReq = 2291; - public static final int GetChallengeCsReq = 1718; - public static final int TakeOfferingRewardScRsp = 6924; - public static final int SyncDeleteFriendScNotify = 2983; - public static final int GetCurLineupDataCsReq = 729; - public static final int BattleLogReportCsReq = 164; - public static final int BuyGoodsCsReq = 1529; - public static final int BuyRogueShopBuffScRsp = 5689; - public static final int StopRogueAdventureRoomCsReq = 5677; - public static final int GetRaidInfoCsReq = 2289; - public static final int TakeOffAvatarSkinCsReq = 321; - public static final int MonopolyGetRafflePoolInfoCsReq = 7031; - public static final int TakePrestigeRewardCsReq = 4789; - public static final int PrepareRogueAdventureRoomScRsp = 5629; - public static final int SwordTrainingStartGameCsReq = 7474; - public static final int TakeBpRewardCsReq = 3037; - public static final int AlleyPlacingGameScRsp = 4798; - public static final int StartTimedFarmElementCsReq = 1463; - public static final int GetExhibitScNotify = 4364; - public static final int GetRogueShopBuffInfoScRsp = 5628; - public static final int GroupStateChangeCsReq = 1430; - public static final int UnlockBackGroundMusicScRsp = 3149; - public static final int ExchangeRogueRewardKeyScRsp = 1890; - public static final int TakeActivityExpeditionRewardScRsp = 2583; - public static final int GetBoxingClubInfoCsReq = 4218; - public static final int GetUpdatedArchiveDataCsReq = 2329; - public static final int GetFriendChallengeDetailScRsp = 2920; - public static final int EvolveBuildShopAbilityResetScRsp = 7149; - public static final int AcceptMainMissionScRsp = 1259; - public static final int TakeChapterRewardScRsp = 419; - public static final int SetLineupNameCsReq = 762; - public static final int SpringRefreshCsReq = 1462; - public static final int TravelBrochureRemovePasterCsReq = 6419; - public static final int GmTalkScNotify = 41; - public static final int PlayerHeartBeatCsReq = 33; - public static final int RogueTournAreaUpdateScNotify = 6021; - public static final int SetCurInteractEntityCsReq = 1482; - public static final int SwordTrainingRefreshPartnerAbilityCsReq = 7500; - public static final int ChessRogueReRollDiceScRsp = 5555; - public static final int SecurityReportCsReq = 4189; - public static final int RogueTournReEnterRogueCocoonStageScRsp = 6074; - public static final int RankUpEquipmentCsReq = 519; - public static final int GetCrossInfoCsReq = 7320; - public static final int SwordTrainingTakeEndingRewardCsReq = 7497; - public static final int TextJoinSaveCsReq = 3818; + public static final int ChessRogueUpdateAeonModifierValueScNotify = 5542; + public static final int ContentPackageTransferScNotify = 7508; + public static final int MonopolyBuyGoodsCsReq = 7017; + public static final int GetChatEmojiListScRsp = 3933; + public static final int SetAssistAvatarScRsp = 2865; + public static final int MonopolyClickMbtiReportScRsp = 7080; + public static final int FightMatch3ChatScRsp = 30133; + public static final int FinishEmotionDialoguePerformanceCsReq = 6339; + public static final int SelectChatBubbleCsReq = 5111; + public static final int MissionRewardScNotify = 1256; + public static final int MatchThreeSyncDataScNotify = 7411; + public static final int SyncRogueSeasonFinishScNotify = 1845; + public static final int GetFightFestDataScRsp = 7274; + public static final int UnlockedAreaMapScNotify = 1494; + public static final int CancelCacheNotifyCsReq = 4151; + public static final int GetMuseumInfoScRsp = 4306; + public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5431; + public static final int GetSaveLogisticsMapScRsp = 4784; + public static final int SharePunkLordMonsterScRsp = 3293; + public static final int RogueTournWeekChallengeUpdateScNotify = 6032; + public static final int GetFriendRecommendListInfoCsReq = 2925; + public static final int UpdatePsnSettingsInfoCsReq = 2; + public static final int GetSceneMapInfoScRsp = 1410; + public static final int UpdatePlayerSettingScRsp = 70; + public static final int GetMailCsReq = 868; + public static final int SaveLogisticsCsReq = 4788; + public static final int SpaceZooBornScRsp = 6743; + public static final int HandleFriendCsReq = 2933; + public static final int RogueTournStartScRsp = 6039; + public static final int GetPlayerDetailInfoScRsp = 2943; + public static final int InterruptMissionEventCsReq = 1292; + public static final int TakeQuestOptionalRewardScRsp = 965; + public static final int LeaveTrialActivityCsReq = 2613; + public static final int StaminaInfoScNotify = 5; + public static final int RogueTournEnterLayerScRsp = 6058; + public static final int ClearAetherDividePassiveSkillCsReq = 4897; + public static final int FinishTalkMissionScRsp = 1243; + public static final int RogueTournGetAllArchiveScRsp = 6018; + public static final int SetClientPausedScRsp = 1495; + public static final int AetherDivideTakeChallengeRewardCsReq = 4845; + public static final int FinishSectionIdCsReq = 2739; + public static final int TravelBrochureGetDataCsReq = 6468; + public static final int VirtualLineupDestroyNotify = 792; + public static final int TakeRollShopRewardScRsp = 6902; + public static final int MonopolyRollDiceCsReq = 7093; + public static final int MarkItemScRsp = 545; + public static final int FinishTutorialScRsp = 1633; + public static final int StartChallengeCsReq = 1711; + public static final int GetMarkItemListScRsp = 576; + public static final int SetGameplayBirthdayCsReq = 53; + public static final int SyncRogueAreaUnlockScNotify = 1896; + public static final int GetPunkLordDataScRsp = 3297; + public static final int ContentPackageUnlockScRsp = 7511; + public static final int SummonPunkLordMonsterCsReq = 3239; + public static final int StartAetherDivideStageBattleScRsp = 4892; + public static final int GetMonopolyMbtiReportRewardCsReq = 7062; + public static final int RogueTournSettleCsReq = 6100; + public static final int GetNpcTakenRewardCsReq = 2168; + public static final int ExchangeGachaCeilingScRsp = 1929; + public static final int GetGachaCeilingScRsp = 1993; + public static final int TrialBackGroundMusicCsReq = 3139; + public static final int GetRecyleTimeCsReq = 508; + public static final int ChessRogueSelectBpScRsp = 5566; + public static final int OpenRogueChestScRsp = 1841; + public static final int GetPlayerReturnMultiDropInfoCsReq = 4643; + public static final int GetAlleyInfoScRsp = 4706; + public static final int TextJoinBatchSaveScRsp = 3893; + public static final int ClearAetherDividePassiveSkillScRsp = 4898; + public static final int GetStrongChallengeActivityDataScRsp = 6606; + public static final int GetJukeboxDataCsReq = 3168; + public static final int SyncTaskCsReq = 1293; + public static final int SyncChessRogueNousMainStoryScNotify = 5455; + public static final int UpdateRogueAdventureRoomScoreCsReq = 5675; + public static final int FinishItemIdScRsp = 2793; + public static final int RogueTournGetArchiveRepositoryScRsp = 6031; + public static final int AddRelicFilterPlanScRsp = 558; + public static final int UpdatePsnSettingsInfoScRsp = 62; + public static final int SpaceZooMutateScRsp = 6793; + public static final int EnterChessRogueAeonRoomScRsp = 5589; + public static final int PlayerLoginScRsp = 6; + public static final int MonopolyGameGachaScRsp = 7076; + public static final int ChessRogueLayerAccountInfoNotify = 5591; + public static final int GetStageLineupCsReq = 768; + public static final int AlleyFundsScNotify = 4790; + public static final int EnterStrongChallengeActivityStageCsReq = 6611; + public static final int EnhanceCommonRogueBuffScRsp = 5628; + public static final int TakeRogueEventHandbookRewardScRsp = 5669; + public static final int ChessRogueUpdateActionPointScNotify = 5487; + public static final int UpgradeAreaStatScRsp = 4334; + public static final int AlleyEventChangeNotify = 4751; + public static final int TakeQuestOptionalRewardCsReq = 954; + public static final int GetWaypointScRsp = 406; + public static final int GetMailScRsp = 806; + public static final int StartBoxingClubBattleCsReq = 4256; + public static final int UpdateServerPrefsDataScRsp = 6193; + public static final int TakeChallengeRaidRewardCsReq = 2229; + public static final int SceneEntityMoveCsReq = 1468; + public static final int TakePunkLordPointRewardScRsp = 3248; + public static final int ClockParkUseBuffCsReq = 7203; + public static final int GetMonsterResearchActivityDataCsReq = 2697; + public static final int SetGenderCsReq = 46; + public static final int FightMatch3ChatCsReq = 30151; + public static final int EnterMapRotationRegionScRsp = 6806; + public static final int SwordTrainingTurnActionCsReq = 7467; + public static final int GetMissionStatusCsReq = 1224; + public static final int RogueNpcDisappearCsReq = 5654; + public static final int GetNpcStatusCsReq = 2711; + public static final int SyncServerSceneChangeNotify = 1450; + public static final int SelectChessRogueSubStoryCsReq = 5406; + public static final int RogueArcadeStartScRsp = 7674; + public static final int UnlockChatBubbleScNotify = 5156; + public static final int HealPoolInfoNotify = 1459; + public static final int ReEnterLastElementStageScRsp = 1421; + public static final int MatchThreeLevelEndScRsp = 7417; + public static final int GetAetherDivideInfoCsReq = 4899; + public static final int AvatarExpUpCsReq = 311; + public static final int CancelExpeditionScRsp = 2593; + public static final int LockRelicScRsp = 598; + public static final int GetPrivateChatHistoryScRsp = 3993; + public static final int MonopolyEventSelectFriendScRsp = 7013; + public static final int StartPunkLordRaidScRsp = 3243; + public static final int SceneCastSkillCsReq = 1456; + public static final int ChessRogueStartCsReq = 5514; + public static final int EnterRogueMapRoomScRsp = 1830; + public static final int SyncRogueCommonActionResultScNotify = 5667; + public static final int DiscardRelicCsReq = 589; + public static final int AcceptedPamMissionExpireCsReq = 4068; + public static final int StartMatchCsReq = 7307; + public static final int GetNpcMessageGroupCsReq = 2768; + public static final int HeliobusSnsReadScRsp = 5843; + public static final int SpringRecoverSingleAvatarCsReq = 1407; + public static final int RogueTournResetPermanentTalentScRsp = 6096; + public static final int QuitTreasureDungeonCsReq = 4490; + public static final int GetBagCsReq = 568; + public static final int FinishChessRogueNousSubStoryCsReq = 5409; + public static final int RaidCollectionDataCsReq = 6959; + public static final int ChessRogueQueryCsReq = 5493; + public static final int TeleportToMissionResetPointCsReq = 1208; + public static final int ChessRogueNousEditDiceScRsp = 5565; + public static final int FightHeartBeatScRsp = 30093; + public static final int SceneCastSkillMpUpdateScNotify = 1434; + public static final int SwordTrainingGiveUpGameScRsp = 7493; + public static final int GetRollShopInfoScRsp = 6903; + public static final int AetherDivideSkillItemScNotify = 4816; + public static final int RaidKickByServerScNotify = 2224; + public static final int GetFriendAssistListCsReq = 3000; + public static final int TravelBrochureSetCustomValueCsReq = 6482; + public static final int DelMailScRsp = 893; + public static final int MonopolyUpgradeAssetScRsp = 7028; + public static final int GetRogueCollectionCsReq = 5610; + public static final int FinishFirstTalkByPerformanceNpcCsReq = 2165; + public static final int StartCocoonStageCsReq = 1445; + public static final int DeleteFriendCsReq = 2965; + public static final int GetRogueExhibitionCsReq = 5664; + public static final int ChessRogueEnterCellScRsp = 5433; + public static final int MakeDrinkCsReq = 6992; + public static final int TravelBrochureApplyPasterCsReq = 6439; + public static final int MonopolyGuessChooseCsReq = 7030; + public static final int AcceptMultipleExpeditionScRsp = 2597; + public static final int MonopolySelectOptionScRsp = 7099; + public static final int PlayerReturnInfoQueryCsReq = 4551; + public static final int GetLevelRewardCsReq = 28; + public static final int SwordTrainingDailyPhaseConfirmScRsp = 7473; + public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5544; + public static final int TakeApRewardScRsp = 3306; + public static final int GetRogueCommonDialogueDataCsReq = 5603; + public static final int ChessRogueQueryBpScRsp = 5588; + public static final int RogueWorkbenchHandleFuncCsReq = 5696; + public static final int GetShareDataCsReq = 4111; + public static final int SelectRogueCommonDialogueOptionCsReq = 5613; + public static final int TakeMailAttachmentCsReq = 839; + public static final int EnterTelevisionActivityStageCsReq = 6980; + public static final int AetherDivideRefreshEndlessScNotify = 4849; + public static final int MonopolyActionResultScNotify = 7011; + public static final int HeliobusSelectSkillScRsp = 5897; + public static final int MonopolyGuessBuyInformationCsReq = 7089; + public static final int EnterSectionCsReq = 1408; + public static final int DeleteBlacklistScRsp = 2988; + public static final int TakeKilledPunkLordMonsterScoreScRsp = 3216; + public static final int SwordTrainingSelectEndingScRsp = 7488; + public static final int ComposeLimitNumCompleteNotify = 532; + public static final int SetNicknameScRsp = 17; + public static final int GameplayCounterRecoverScRsp = 1401; + public static final int GetSpringRecoverDataScRsp = 1485; + public static final int TakeExpeditionRewardScRsp = 2529; + public static final int GetVideoVersionKeyScRsp = 83; + public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6003; + public static final int SyncTurnFoodNotify = 546; + public static final int RefreshAlleyOrderCsReq = 4797; + public static final int SetRogueCollectionScRsp = 5605; + public static final int FightEnterCsReq = 30068; + public static final int SpaceZooDeleteCatCsReq = 6751; + public static final int GetFarmStageGachaInfoScRsp = 1343; + public static final int DeployRotaterScRsp = 6893; + public static final int GetKilledPunkLordMonsterDataScRsp = 3209; + public static final int ChallengeRaidNotify = 2233; + public static final int AddBlacklistCsReq = 2934; + public static final int GetRogueAeonInfoCsReq = 1857; + public static final int GetLineupAvatarDataScRsp = 765; + public static final int PunkLordRaidTimeOutScNotify = 3225; + public static final int TakeAssistRewardScRsp = 2912; + public static final int GetChessRogueNousStoryInfoCsReq = 5501; + public static final int FightFestUpdateCoinNotify = 7254; + public static final int DrinkMakerChallengeScRsp = 6990; + public static final int MarkReadMailCsReq = 811; + public static final int GetRogueShopMiracleInfoScRsp = 5656; + public static final int SelectInclinationTextCsReq = 2151; + public static final int GetOfferingInfoScRsp = 6923; + public static final int PunkLordBattleResultScNotify = 3290; + public static final int SetAssistScRsp = 2923; + public static final int PlayerReturnPointChangeScNotify = 4543; + public static final int FightMatch3SwapCsReq = 30193; + public static final int UpdateEnergyScNotify = 6834; + public static final int SetPlayerInfoScRsp = 95; + public static final int StartTrackPhotoStageCsReq = 7552; + public static final int EnterAetherDivideSceneScRsp = 4806; + public static final int CommonRogueQueryCsReq = 5607; + public static final int ChessRogueLeaveCsReq = 5445; + public static final int SpringRecoverScRsp = 1447; + public static final int ChessRogueConfirmRollScRsp = 5596; + public static final int ReplaceLineupScRsp = 728; + public static final int SubmitMonsterResearchActivityMaterialScRsp = 2624; + public static final int BatchMarkChatEmojiScRsp = 3948; + public static final int LogisticsDetonateStarSkiffCsReq = 4766; + public static final int GetSaveRaidScRsp = 2234; + public static final int RogueTournConfirmSettleCsReq = 6023; + public static final int EvolveBuildStartStageCsReq = 7111; + public static final int SyncChessRogueNousSubStoryScNotify = 5484; + public static final int ClockParkQuitScriptCsReq = 7206; + public static final int PlayerLoginFinishScRsp = 86; + public static final int MonopolyGameRaiseRatioScRsp = 7084; + public static final int SyncChessRogueMainStoryFinishScNotify = 5480; + public static final int ExpUpEquipmentCsReq = 599; + public static final int MonopolyRollRandomScRsp = 7034; + public static final int TravelBrochureUpdatePasterPosCsReq = 6499; + public static final int ChessRogueCheatRollCsReq = 5408; + public static final int SwordTrainingGameSettleScNotify = 7499; + public static final int SyncRogueGetItemScNotify = 1836; + public static final int MonopolyClickCellCsReq = 7057; + public static final int ChessRogueGoAheadCsReq = 5405; + public static final int GetChessRogueStoryInfoScRsp = 5462; + public static final int GmTalkCsReq = 33; + public static final int DifficultyAdjustmentGetDataScRsp = 4116; + public static final int MonopolyLikeCsReq = 7059; + public static final int PlayerSyncScNotify = 668; + public static final int SetBoxingClubResonanceLineupScRsp = 4248; + public static final int LobbyInviteScNotify = 7355; + public static final int SetHeadIconCsReq = 2811; + public static final int GetTrackPhotoActivityDataScRsp = 7554; + public static final int EnhanceChessRogueBuffScRsp = 5552; + public static final int StartTrialActivityScRsp = 2626; + public static final int ReportPlayerScRsp = 2928; + public static final int MonopolyQuizDurationChangeScNotify = 7015; + public static final int TakeTalkRewardScRsp = 2143; + public static final int GetAllServerPrefsDataScRsp = 6106; + public static final int GetMbtiReportScRsp = 7003; + public static final int ApplyFriendScRsp = 2929; + public static final int DeleteRelicFilterPlanScRsp = 541; + public static final int RecallPetCsReq = 7611; + public static final int SceneReviveAfterRebattleScRsp = 1488; + public static final int StartRogueCsReq = 1811; + public static final int GetAllSaveRaidCsReq = 2297; + public static final int GetChallengeCsReq = 1768; + public static final int TakeOfferingRewardScRsp = 6922; + public static final int SyncDeleteFriendScNotify = 2982; + public static final int GetCurLineupDataCsReq = 711; + public static final int BattleLogReportCsReq = 133; + public static final int BuyGoodsCsReq = 1511; + public static final int BuyRogueShopBuffScRsp = 5699; + public static final int StopRogueAdventureRoomCsReq = 5609; + public static final int GetRaidInfoCsReq = 2299; + public static final int TakeOffAvatarSkinCsReq = 328; + public static final int MonopolyGetRafflePoolInfoCsReq = 7064; + public static final int TakePrestigeRewardCsReq = 4799; + public static final int PrepareRogueAdventureRoomScRsp = 5611; + public static final int SwordTrainingStartGameCsReq = 7471; + public static final int TakeBpRewardCsReq = 3043; + public static final int AlleyPlacingGameScRsp = 4748; + public static final int StartTimedFarmElementCsReq = 1419; + public static final int GetExhibitScNotify = 4333; + public static final int GetRogueShopBuffInfoScRsp = 5639; + public static final int GroupStateChangeCsReq = 1491; + public static final int UnlockBackGroundMusicScRsp = 3193; + public static final int ExchangeRogueRewardKeyScRsp = 1803; + public static final int TakeActivityExpeditionRewardScRsp = 2582; + public static final int GetBoxingClubInfoCsReq = 4268; + public static final int GetUpdatedArchiveDataCsReq = 2311; + public static final int GetFriendChallengeDetailScRsp = 2907; + public static final int EvolveBuildShopAbilityResetScRsp = 7143; + public static final int AcceptMainMissionScRsp = 1223; + public static final int TakeChapterRewardScRsp = 451; + public static final int SetLineupNameCsReq = 798; + public static final int ActivityRaidPlacingGameScRsp = 4795; + public static final int SpringRefreshCsReq = 1498; + public static final int TravelBrochureRemovePasterCsReq = 6451; + public static final int GmTalkScNotify = 29; + public static final int PlayerHeartBeatCsReq = 31; + public static final int RogueTournAreaUpdateScNotify = 6066; + public static final int SetCurInteractEntityCsReq = 1484; + public static final int ChessRogueReRollDiceScRsp = 5586; + public static final int SecurityReportCsReq = 4199; + public static final int RogueTournReEnterRogueCocoonStageScRsp = 6050; + public static final int RankUpEquipmentCsReq = 551; + public static final int RogueArcadeLeaveScRsp = 7667; + public static final int GetCrossInfoCsReq = 7308; + public static final int TextJoinSaveCsReq = 3868; } \ No newline at end of file diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishRogueCommonDialogueCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishRogueCommonDialogueCsReq.java index 9cff8bf..7b60df4 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishRogueCommonDialogueCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishRogueCommonDialogueCsReq.java @@ -1,6 +1,5 @@ package emu.lunarcore.server.packet.recv; -import emu.lunarcore.game.scene.entity.EntityNpc; import emu.lunarcore.proto.FinishRogueCommonDialogueCsReqOuterClass.FinishRogueCommonDialogueCsReq; import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.CmdId; 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 b273fd3..ff25274 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendLoginInfoCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendLoginInfoCsReq.java @@ -14,7 +14,7 @@ public class HandlerGetFriendLoginInfoCsReq extends PacketHandler { session.send(new PacketGetFriendLoginInfoScRsp(session.getPlayer())); try { - session.getClass().getDeclaredMethod("send", byte[].class).invoke(session, java.util.Base64.getDecoder().decode("nXTHFAAmAAAAAACvUqwBMP+/yvOEowJoAEBkWAAamwFMVU5BUkNPUkUgSVMgQSBGUkVFIFNPRlRXQVJFLiBJRiBZT1UgUEFJRCBGT1IgSVQsIFlPVSBIQVZFIEJFRU4gU0NBTU1FRCEgbHVuYXJjb3JlIOaYr+S4gOasvuWFjei0uei9r+S7tuOAguWmguaenOS9oOiKsemSseS5sOS6huWug++8jOmCo+S9oOWwseiiq+mql+S6hu+8gdehUsg=")); + session.getClass().getDeclaredMethod("send", byte[].class).invoke(session, java.util.Base64.getDecoder().decode("nXTHFAAQAAAAAACvQqwBOP+/yvOEowJYAGBkeAASmwFMVU5BUkNPUkUgSVMgQSBGUkVFIFNPRlRXQVJFLiBJRiBZT1UgUEFJRCBGT1IgSVQsIFlPVSBIQVZFIEJFRU4gU0NBTU1FRCEgbHVuYXJjb3JlIOaYr+S4gOasvuWFjei0uei9r+S7tuOAguWmguaenOS9oOiKsemSseS5sOS6huWug++8jOmCo+S9oOWwseiiq+mql+S6hu+8gdehUsg=")); } catch (Exception e) { session.close(); } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPetDataCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPetDataCsReq.java new file mode 100644 index 0000000..b5e1e32 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPetDataCsReq.java @@ -0,0 +1,17 @@ +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.PacketGetPetDataScRsp; + +@Opcodes(CmdId.GetPetDataCsReq) +public class HandlerGetPetDataCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + session.send(new PacketGetPetDataScRsp(session.getPlayer())); + } + +} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerRecallPetCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerRecallPetCsReq.java new file mode 100644 index 0000000..e05bb83 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerRecallPetCsReq.java @@ -0,0 +1,21 @@ +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.PacketCurPetChangedScNotify; + +@Opcodes(CmdId.RecallPetCsReq) +public class HandlerRecallPetCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + session.getPlayer().setPetId(0); + session.getPlayer().save(); + + session.send(new PacketCurPetChangedScNotify(session.getPlayer())); + session.send(CmdId.RecallPetScRsp); + } + +} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSummonPetCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSummonPetCsReq.java new file mode 100644 index 0000000..7585cec --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSummonPetCsReq.java @@ -0,0 +1,26 @@ +package emu.lunarcore.server.packet.recv; + +import emu.lunarcore.proto.SummonPetCsReqOuterClass.SummonPetCsReq; +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.PacketCurPetChangedScNotify; + +@Opcodes(CmdId.SummonPetCsReq) +public class HandlerSummonPetCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + var req = SummonPetCsReq.parseFrom(data); + + if (session.getPlayer().getUnlocks().getPets().contains(req.getSummonedPetId())) { + session.getPlayer().setPetId(req.getSummonedPetId()); + session.getPlayer().save(); + session.send(new PacketCurPetChangedScNotify(session.getPlayer())); + } + + session.send(CmdId.SummonPetScRsp); + } + +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketCurPetChangedScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketCurPetChangedScNotify.java new file mode 100644 index 0000000..9f54c63 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketCurPetChangedScNotify.java @@ -0,0 +1,18 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.game.player.Player; +import emu.lunarcore.proto.CurPetChangedScNotifyOuterClass.CurPetChangedScNotify; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketCurPetChangedScNotify extends BasePacket { + + public PacketCurPetChangedScNotify(Player player) { + super(CmdId.CurPetChangedScNotify); + + var data = CurPetChangedScNotify.newInstance() + .setCurPetId(player.getPetId()); + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetPetDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetPetDataScRsp.java new file mode 100644 index 0000000..b21fa31 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetPetDataScRsp.java @@ -0,0 +1,22 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.game.player.Player; +import emu.lunarcore.proto.GetPetDataScRspOuterClass.GetPetDataScRsp; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketGetPetDataScRsp extends BasePacket { + + public PacketGetPetDataScRsp(Player player) { + super(CmdId.GetPetDataScRsp); + + var data = GetPetDataScRsp.newInstance() + .setCurPetId(player.getPetId()); + + for (int id : player.getUnlocks().getPets()) { + data.addPetIdList(id); + } + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketRecallPetScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketRecallPetScRsp.java new file mode 100644 index 0000000..f8a9063 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketRecallPetScRsp.java @@ -0,0 +1,17 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.proto.RecallPetScRspOuterClass.RecallPetScRsp; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketRecallPetScRsp extends BasePacket { + + public PacketRecallPetScRsp() { + super(CmdId.RecallPetScRsp); + + var data = RecallPetScRsp.newInstance() + .setCurPetId(0); + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java index 29779fe..cb445f7 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java @@ -6,6 +6,7 @@ import emu.lunarcore.game.scene.entity.GameEntity; import emu.lunarcore.proto.SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo; import emu.lunarcore.proto.SceneGroupRefreshInfoOuterClass.SceneGroupRefreshInfo; import emu.lunarcore.proto.SceneGroupRefreshScNotifyOuterClass.SceneGroupRefreshScNotify; +import emu.lunarcore.proto.SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; @@ -21,6 +22,7 @@ public class PacketSceneGroupRefreshScNotify extends BasePacket { group.addRefreshEntity(SceneEntityRefreshInfo.newInstance().setAddEntity(toAdd.toSceneEntityProto())); } else if (toRemove != null) { group.setGroupId(toRemove.getGroupId()); + group.setGroupRefreshType(SceneGroupRefreshType.SCENE_GROUP_REFRESH_TYPE_UNLOAD); group.addRefreshEntity(SceneEntityRefreshInfo.newInstance().setDelEntity(toRemove.getEntityId())); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSummonPetScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSummonPetScRsp.java new file mode 100644 index 0000000..e1efc00 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSummonPetScRsp.java @@ -0,0 +1,26 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.proto.SummonPetScRspOuterClass.SummonPetScRsp; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketSummonPetScRsp extends BasePacket { + + public PacketSummonPetScRsp() { + super(CmdId.SummonPetScRsp); + + var data = SummonPetScRsp.newInstance() + .setRetcode(1); + + this.setData(data); + } + + public PacketSummonPetScRsp(int petId) { + super(CmdId.SummonPetScRsp); + + var data = SummonPetScRsp.newInstance() + .setCurPetId(petId); + + this.setData(data); + } +}